web/views/primary.py
branchstable
changeset 2237 7e546c3d6ea5
parent 2217 3a8cee8f8778
child 2293 7ded2a1416e4
child 2312 af4d8f75c5db
equal deleted inserted replaced
2233:bf3603caaf0d 2237:7e546c3d6ea5
    50         # entity's attributes and relations, excluding meta data
    50         # entity's attributes and relations, excluding meta data
    51         # if the entity isn't meta itself
    51         # if the entity isn't meta itself
    52         boxes = self._prepare_side_boxes(entity)
    52         boxes = self._prepare_side_boxes(entity)
    53         if boxes or hasattr(self, 'render_side_related'):
    53         if boxes or hasattr(self, 'render_side_related'):
    54             self.w(u'<table width="100%"><tr><td style="width: 75%">')
    54             self.w(u'<table width="100%"><tr><td style="width: 75%">')
    55         self.w(u'<div>')
       
    56         self.w(u'<div class="mainInfo">')
    55         self.w(u'<div class="mainInfo">')
    57         self.content_navigation_components('navcontenttop')
    56         self.content_navigation_components('navcontenttop')
    58         try:
    57         try:
    59             self.render_entity_attributes(entity)
    58             self.render_entity_attributes(entity)
    60         except TypeError, e: # XXX bw compat
    59         except TypeError, e: # XXX bw compat
    61             if 'render_entity' not in e.args[0]:
    60             if 'render_entity' not in e.args[0]:
    62                 raise
    61                 raise
    63             warn('siderelations argument of render_entity_attributes is '
    62             warn('siderelations argument of render_entity_attributes is '
    64                  'deprecated (%s)' % self.__class__)
    63                  'deprecated (%s)' % self.__class__)
    65             self.render_entity_attributes(entity, [])
    64             self.render_entity_attributes(entity, [])
    66         self.w(u'</div>')
       
    67         if self.main_related_section:
    65         if self.main_related_section:
    68             try:
    66             try:
    69                 self.render_entity_relations(entity)
    67                 self.render_entity_relations(entity)
    70             except TypeError, e: # XXX bw compat
    68             except TypeError, e: # XXX bw compat
    71                 if 'render_entity' not in e.args[0]:
    69                 if 'render_entity' not in e.args[0]:
    72                     raise
    70                     raise
    73                 warn('siderelations argument of render_entity_relations is '
    71                 warn('siderelations argument of render_entity_relations is '
    74                      'deprecated')
    72                      'deprecated')
    75                 self.render_entity_relations(entity, [])
    73                 self.render_entity_relations(entity, [])
    76         self.w(u'</div>')
    74         self.w(u'</div>')
       
    75         # side boxes
    77         if boxes or hasattr(self, 'render_side_related'):
    76         if boxes or hasattr(self, 'render_side_related'):
    78             self.w(u'</td><td>')
    77             self.w(u'</td><td>')
    79             # side boxes
       
    80             self.w(u'<div class="primaryRight">')
    78             self.w(u'<div class="primaryRight">')
    81             if hasattr(self, 'render_side_related'):
    79             if hasattr(self, 'render_side_related'):
    82                 warn('render_side_related is deprecated')
    80                 warn('render_side_related is deprecated')
    83                 self.render_side_related(entity, [])
    81                 self.render_side_related(entity, [])
    84             self.render_side_boxes(boxes)
    82             self.render_side_boxes(boxes)