diff MoinMoin/theme/__init__.py @ 393:f25101c236bb

optimized footer display and print view, removed some ancient code imported from: moin--main--1.5--patch-397
author Thomas Waldmann <tw@waldmann-edv.de>
date Sat, 21 Jan 2006 19:57:05 +0000
parents bf754e0d6472
children 493972205fac
line wrap: on
line diff
--- a/MoinMoin/theme/__init__.py	Sat Jan 21 16:28:02 2006 +0000
+++ b/MoinMoin/theme/__init__.py	Sat Jan 21 19:57:05 2006 +0000
@@ -266,7 +266,6 @@
                 # Just use the text as is.
                 pagename = title = text
 
-
         # Handle regular pagename like "FrontPage"
         else:
             # Use localized pages for the current user
@@ -617,9 +616,9 @@
     def pageinfo(self, page):
         """ Return html fragment with page meta data
 
-        Since page information use translated text, it use the ui
+        Since page information uses translated text, it uses the ui
         language and direction. It looks strange sometimes, but
-        translated text using page direction look worse.
+        translated text using page direction looks worse.
         
         @param page: current page
         @rtype: unicode
@@ -634,6 +633,10 @@
                     info = _("last edited %(time)s by %(editor)s") % info
                 else:
                     info = _("last modified %(time)s") % info
+                pagename = page.page_name
+                if self.request.cfg.show_interwiki:
+                    pagename = "%s: %s" % (self.request.cfg.interwikiname, pagename)
+                info = "%s  (%s)" % (pagename, info)
                 html = '<p id="pageinfo" class="info"%(lang)s>%(info)s</p>\n' % {
                     'lang': self.ui_lang_attr(),
                     'info': info
@@ -695,7 +698,7 @@
         """
         html = ''
         if self.cfg.show_version and not keywords.get('print_mode', 0):
-            html = (u'<div id="version">MoinMoin %s, Copyright 2000-2005 by '
+            html = (u'<div id="version">MoinMoin %s, Copyright 2000-2006 by '
                     'Juergen Hermann</div>') % (version.revision,)
         return html