[base template header] changeset 6669:e4532c6acf34 introduce a visual regression on standard site, fix it by merging header-left/header-center context, it simplify things and have proper display. Cubes using 'firstcolumn' css class will have to be upgraded
--- a/web/views/basecomponents.py Fri Nov 05 10:41:56 2010 +0100
+++ b/web/views/basecomponents.py Fri Nov 05 10:49:33 2010 +0100
@@ -80,17 +80,16 @@
__abstract__ = True
cw_property_defs = component.override_ctx(
component.CtxComponent,
- vocabulary=['header-left', 'header-center', 'header-right'])
+ vocabulary=['header-left', 'header-right'])
# don't want user to hide this component using an cwproperty
site_wide = True
- context = _('header-center')
+ context = _('header-left')
class ApplLogo(HeaderComponent):
"""build the instance logo, usually displayed in the header"""
__regid__ = 'logo'
order = -1
- context = _('header-left')
def render(self, w):
w(u'<a href="%s"><img id="logo" src="%s" alt="logo"/></a>'
@@ -100,7 +99,6 @@
class ApplicationName(HeaderComponent):
"""display the instance name"""
__regid__ = 'appliname'
- context = _('header-center')
def render(self, w):
title = self._cw.property_value('ui.site-title')
--- a/web/views/basetemplates.py Fri Nov 05 10:41:56 2010 +0100
+++ b/web/views/basetemplates.py Fri Nov 05 10:49:33 2010 +0100
@@ -339,8 +339,7 @@
"""build the top menu with authentification info and the rql box"""
w = self.w
w(u'<table id="header"><tr>\n')
- for colid, context in (('firstcolumn', 'header-left'),
- ('headtext', 'header-center'),
+ for colid, context in (('headtext', 'header-left'),
('header-right', 'header-right'),
):
w(u'<td id="%s">' % colid)