diff MoinMoin/theme/__init__.py @ 306:4e5e4fc9f7fa

fixed rendering of modern for IE, Opera, Konqueror (as far as possible). TODO: other themes imported from: moin--main--1.5--patch-310
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 11 Dec 2005 22:11:48 +0000
parents 6c74345f4d55
children bf754e0d6472
line wrap: on
line diff
--- a/MoinMoin/theme/__init__.py	Sat Dec 10 22:10:11 2005 +0000
+++ b/MoinMoin/theme/__init__.py	Sun Dec 11 22:11:48 2005 +0000
@@ -234,8 +234,8 @@
             else:
                 userlinks.append(preferencesPage.link_to(request, text=_("Login")))
 
-        userlinks = [u'<li>%s</li>\n' % link for link in userlinks]
-        html = u'<ul id="username">\n%s</ul>' % ''.join(userlinks)
+        userlinks = [u'<li>%s</li>' % link for link in userlinks]
+        html = u'<ul id="username">%s</ul>' % ''.join(userlinks)
         return html
 
     # Schemas supported in toolbar links, using [url label] format
@@ -391,7 +391,7 @@
             items.append(item % (cls, link))
 
         # Assemble html
-        items = u'\n'.join(items)
+        items = u''.join(items)
         html = u'''
 <ul id="navibar">
 %s
@@ -540,7 +540,7 @@
                 html = '''
 <ul id="pagetrail">
 %s
-</ul>''' % '\n'.join(items)
+</ul>''' % ''.join(items)
         return html
 
     def html_stylesheets(self, d):
@@ -856,7 +856,7 @@
         """ Create credits html from credits list """
         if isinstance(self.cfg.page_credits, (list, tuple)):
             items = ['<li>%s</li>' % i for i in self.cfg.page_credits]
-            html = '<ul id="credits">\n%s\n</ul>\n' % '\n'.join(items)
+            html = '<ul id="credits">\n%s\n</ul>\n' % ''.join(items)
         else:
             # Old config using string, output as is
             html = self.cfg.page_credits
@@ -1006,9 +1006,9 @@
         html = self._cache.get('editbar')
         if html is None:
             # Remove empty items and format as list
-            items = '\n'.join(['<li>%s</li>' % item
-                               for item in self.editbarItems(page) if item])
-            html = u'<ul class="editbar">\n%s\n</ul>\n' % items
+            items = ''.join(['<li>%s</li>' % item
+                             for item in self.editbarItems(page) if item])
+            html = u'<ul class="editbar">%s</ul>\n' % items
             self._cache['editbar'] = html
         
         return html