1.1 --- a/themes/mercurialwiki/mercurialwiki.py Sun May 23 17:26:54 2010 +0200
1.2 +++ b/themes/mercurialwiki/mercurialwiki.py Sun May 23 18:38:30 2010 +0200
1.3 @@ -108,8 +108,11 @@
1.4 html.append(fmt.div(on=1, attr={"id" : "header"}))
1.5
1.6 html.append(self.logo())
1.7 - html.append(self.searchform(d))
1.8 - html.append(self.navibar(d))
1.9 +
1.10 + html.append(fmt.div(on=1, attr={"class" : "controls"}))
1.11 + html.append(self.navibar(d).strip())
1.12 + html.append(self.searchform(d).strip())
1.13 + html.append(fmt.div(on=0))
1.14
1.15 html.append(fmt.div(on=0))
1.16
1.17 @@ -164,7 +167,9 @@
1.18 html.append(fmt.div(on=1, attr={"id" : "footer"}))
1.19
1.20 if self.shouldShowEditbar(page):
1.21 + html.append(fmt.div(on=1, attr={"class" : "controls"}))
1.22 html.append(self.editbar(d))
1.23 + html.append(fmt.div(on=0))
1.24
1.25 # A separator.
1.26
1.27 @@ -184,6 +189,19 @@
1.28
1.29 return u''.join(html)
1.30
1.31 + def actionsMenu(self, page):
1.32 +
1.33 + """ An overridden version of the actions menu
1.34 +
1.35 + This method strips the adjacent white-space from the generated menu.
1.36 +
1.37 + @param page: current page, Page object
1.38 + @rtype: unicode
1.39 + @return: actions menu html fragment
1.40 + """
1.41 +
1.42 + return ThemeBase.actionsMenu(self, page).strip()
1.43 +
1.44 # Theme instantiation.
1.45
1.46 def execute(request):