Changeset 2705 for trac

Timestamp:

02/16/05 17:31:12 (8 years ago)

Author:

hauma

Message:

• Fancyfication: Sort the currently active top-level category to the first position in the navigation bar.

File:

• trac/trunk/wiki-macros/JPNav.py (modified) (3 diffs)

trac/trunk/wiki-macros/JPNav.py

@@ -85 +85 @@
     if (hdf.getValue('trac.acl.WIKI_MODIFY', '')):
         html += '<div class="wiki-tocedit"><a href="%s?edit=yes">edit</a></div>' % env.href.wiki(name)
-    (_, subhtml) = generate(env, curpage, toc)
+    (_, subhtml) = generate(env, curpage, toc, 0)
     html += subhtml
     html += '</div>'
@@ -91 +91 @@
 
 
-def generate(env, curpage, toc):
-    html = '<ul>'
+def generate(env, curpage, toc, level):
+    html = ''
     found = 0
     for name, title, sub in toc:
@@ -105 +105 @@
             html += '</li>'
         else:
-            html += '<li>'
-            (subfound, subhtml) = generate(env, curpage, sub)
+            (subfound, subhtml) = generate(env, curpage, sub, level + 1)
             if subfound:
-                html += '<h4>%s</h4>' % title
-                html += subhtml
+                menu = ''
+                menu += '<li>'
+                menu += '<h4>%s</h4>' % title
+                menu += subhtml
+                menu += '</li>'
                 found = 1
+                if level == 0:
+                    html = menu + html
+                else:
+                    html += menu
             else:
+                html += '<li>'
                 html += '<h4><a href="%s">%s...</a></h4>' % (env.href.wiki(name), title)
-            html += '</li>'
-    html += '</ul>'
+                html += '</li>'
+    html = '<ul>%s</ul>' % html
     return (found, html);