1.1 --- a/themes/ep2008/ep2008.py Sat Dec 01 01:03:05 2007 +0100
1.2 +++ b/themes/ep2008/ep2008.py Sat Dec 01 19:54:36 2007 +0100
1.3 @@ -97,17 +97,18 @@
1.4 # Footer
1.5 u'<div id="footer">',
1.6 self.cfg.contact_string,
1.7 + u'<div id="contribute">',
1.8 + #self.cfg.contribute_string,
1.9 + #u'<div class="contribute-hidden">',
1.10 + #self.username(d),
1.11 + #u'<div id="locationline">',
1.12 + #self.interwiki(d),
1.13 + #self.title(d),
1.14 + #u'</div>',
1.15 + self.specialUsername(d),
1.16 + self.editbar(d),
1.17 self.trail(d),
1.18 - u'<div id="contribute">',
1.19 - self.cfg.contribute_string,
1.20 - u'<div class="contribute-hidden">',
1.21 - self.username(d),
1.22 - u'<div id="locationline">',
1.23 - self.interwiki(d),
1.24 - self.title(d),
1.25 - u'</div>',
1.26 - self.editbar(d),
1.27 - u'</div>',
1.28 + #u'</div>',
1.29 u'</div>',
1.30 self.credits(d),
1.31 self.showversion(d, **keywords),
1.32 @@ -118,6 +119,40 @@
1.33 ]
1.34 return u'\n'.join(html)
1.35
1.36 + def editbarItems(self, page):
1.37 + """ Return list of items to show on the editbar
1.38 +
1.39 + This is separate method to make it easy to customize the
1.40 + editbar in sub classes.
1.41 + """
1.42 +
1.43 + request = self.request
1.44 +
1.45 + items = [self.editorLink(page),
1.46 + self.infoLink(page),
1.47 + self.subscribeLink(page),
1.48 + self.quicklinkLink(page),]
1.49 +
1.50 + if page.isWritable() and request.user.valid and request.user.may.write(page.page_name):
1.51 + items.append(self.attachmentsLink(page))
1.52 +
1.53 + if request.user.valid:
1.54 + items.append(self.actionsMenu(page))
1.55 +
1.56 + return items
1.57 +
1.58 + def specialUsername(self, d):
1.59 + request = self.request
1.60 + _ = request.getText
1.61 +
1.62 + if request.user.valid and request.user.name:
1.63 + return u'<div class="username">%s</div>' % request.formatter.text(request.user.name)
1.64 + else:
1.65 + # NOTE: Using the contribute string!
1.66 + return u'<div class="no-username">%s</div>' % \
1.67 + d['page'].link_to(request, text=self.cfg.contribute_string,
1.68 + querystr={'action': 'login'}, id="login")
1.69 +
1.70 def execute(request):
1.71 """
1.72 Generate and return a theme object