[primary] fix #344249 stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Thu, 02 Jul 2009 11:18:08 +0200
branchstable
changeset 2237 7e546c3d6ea5
parent 2233 bf3603caaf0d
child 2238 2e69aa0af4ce
[primary] fix #344249
web/component.py
web/views/primary.py
--- a/web/component.py	Thu Jul 02 10:30:44 2009 +0200
+++ b/web/component.py	Thu Jul 02 11:18:08 2009 +0200
@@ -37,7 +37,7 @@
 
     property_defs = {
         _('visible'):  dict(type='Boolean', default=True,
-                            help=_('display the box or not')),
+                            help=_('display the component or not')),
         _('order'):    dict(type='Int', default=99,
                             help=_('display order of the component')),
         _('context'):  dict(type='String', default='header',
--- a/web/views/primary.py	Thu Jul 02 10:30:44 2009 +0200
+++ b/web/views/primary.py	Thu Jul 02 11:18:08 2009 +0200
@@ -52,7 +52,6 @@
         boxes = self._prepare_side_boxes(entity)
         if boxes or hasattr(self, 'render_side_related'):
             self.w(u'<table width="100%"><tr><td style="width: 75%">')
-        self.w(u'<div>')
         self.w(u'<div class="mainInfo">')
         self.content_navigation_components('navcontenttop')
         try:
@@ -63,7 +62,6 @@
             warn('siderelations argument of render_entity_attributes is '
                  'deprecated (%s)' % self.__class__)
             self.render_entity_attributes(entity, [])
-        self.w(u'</div>')
         if self.main_related_section:
             try:
                 self.render_entity_relations(entity)
@@ -74,9 +72,9 @@
                      'deprecated')
                 self.render_entity_relations(entity, [])
         self.w(u'</div>')
+        # side boxes
         if boxes or hasattr(self, 'render_side_related'):
             self.w(u'</td><td>')
-            # side boxes
             self.w(u'<div class="primaryRight">')
             if hasattr(self, 'render_side_related'):
                 warn('render_side_related is deprecated')