[Mpuls-commits] r280 - in wasko/trunk: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-02-22 17:45:40 +0100 (Sun, 22 Feb 2009)
New Revision: 280

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/model/navigation.py
Log:
Fix HTML rendering bug in navigation.


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-02-22 16:12:40 UTC (rev 279)
+++ wasko/trunk/ChangeLog.txt	2009-02-22 16:45:40 UTC (rev 280)
@@ -1,5 +1,10 @@
 2009-02-22	Sascha L. Teichmann <teichmann at intevation.de>
 
+	* waskaweb/model/navigation.py: Fixed HTML rendering bug.
+	  TODO: Offline client needs this fix, too.
+
+2009-02-22	Sascha L. Teichmann <teichmann at intevation.de>
+
 	Support invisible pages.
 
 	* waskaweb/model/data.py: PageNode object now support

Modified: wasko/trunk/waskaweb/model/navigation.py
===================================================================
--- wasko/trunk/waskaweb/model/navigation.py	2009-02-22 16:12:40 UTC (rev 279)
+++ wasko/trunk/waskaweb/model/navigation.py	2009-02-22 16:45:40 UTC (rev 280)
@@ -89,7 +89,7 @@
                     u' border="0"'
                     u' alt="Formularseite" title="Seite öffnen"'))
 
-            out.append(u'</a> <a href="%s" class="navigation">%s</a>\n' % (
+            out.append(u'</a> <a href="%s" class="navigation">%s</a></span>\n' % (
                 select_link, escape(self.description)))
         else:
             # when clicking on link select the first page in branch
@@ -114,7 +114,7 @@
                 out.append(u'<a href="%s" class="navigation">%s</a>' % (
                     select_link, escape(self.description)))
 
-                out.append(u'<ul>\n')
+                out.append(u'</span>\n<ul>\n')
                 for child in self.children:
                     child.render(page, out, get_image, error_lookup)
                 out.append(u'</ul>\n')
@@ -128,10 +128,10 @@
                     
                 out.append(u'</a> ')
 
-                out.append(u'<a href="%s" class="navigation">%s</a>' % (
+                out.append(u'<a href="%s" class="navigation">%s</a></span>' % (
                     select_link, escape(self.description)))
 
-        out.append(u"</span></li>\n")
+        out.append(u"</li>\n")
 
     def set_open(self, flag):
         self.is_open = flag