Changeset 2933 for trac

Timestamp:

03/24/05 17:43:53 (8 years ago)

Author:

hauma

Message:

• Fancyfied indentation of the TracNav navigation bar. Indentation now strictly follows the submenu structure. Unlike in TracGuideToc, all entries in a (sub-)menu are now indented one step below the menu heading.

Location:

trac/trunk

Files:

• htdocs/css/wiki.css (modified) (1 diff)
• wiki-macros/TracNav.py (modified) (3 diffs)

trac/trunk/htdocs/css/wiki.css

@@ -39 +39 @@
 
 /* Styles for TracNav */
-.wiki-toc.trac-nav li { margin: 0; padding: 0; }
-.wiki-toc.trac-nav li li { margin: 0; padding: 0 1em; }
+.wiki-toc.trac-nav h4 { margin: 0; padding: 0; }
+.wiki-toc.trac-nav li { margin: 0; padding: 0 1em; }
+.wiki-toc.trac-nav li li { padding-right: 0em;}
 .wiki-toc.trac-nav .edit { border:0; position:absolute; top:0; right:5px; }
 .wiki-toc.trac-nav .edit a { color:blue; border-color:blue; }

trac/trunk/wiki-macros/TracNav.py

@@ -23 +23 @@
 {{{
 /* Styles for TracNav */
-.wiki-toc.trac-nav li { margin: 0; padding: 0; }
-.wiki-toc.trac-nav li li { margin: 0; padding: 0 1em; }
+.wiki-toc.trac-nav h4 { margin: 0; padding: 0; }
+.wiki-toc.trac-nav li { margin: 0; padding: 0 1em; }
+.wiki-toc.trac-nav li li { padding-right: 0em;}
 .wiki-toc.trac-nav .edit { border:0; position:absolute; top:0; right:5px; }
 .wiki-toc.trac-nav .edit a { color:blue; border-color:blue; }
@@ -154 +155 @@
         return msg
 
-    html = ''
-    html += '<div class="wiki-toc trac-nav">\n'
-    if (hdf.getValue('trac.acl.WIKI_MODIFY', '')):
-        html += '<div class="edit"><a href="%s?edit=yes">edit</a></div>\n' % env.href.wiki(name)
     (found, filtered) = filter(curpage, toc, 0)
     if found:
-        html += display(env, curpage, filtered, 1)
+        return displayAll(hdf, env, name, curpage, filtered, 0)
     else:
-        html += display(env, curpage, toc, 1)
-    html += '</div>\n'
-    return html
+        return displayAll(hdf, env, name, curpage, toc, 0)
 
 
@@ -192 +187 @@
     return ' ' * col
 
+def displayAll(hdf, env, name, curpage, toc, col):
+    html = ''
+    html += '%s<div class="wiki-toc trac-nav">\n' % indentation(col)
+    col += 1
+    if hdf.getValue('trac.acl.WIKI_MODIFY', ''):
+        html += '%s<div class="edit"><a href="%s?edit=yes">edit</a></div>\n' % (indentation(col), env.href.wiki(name))
+    html += display(env, curpage, toc, col)
+    col -= 1
+    html += '%s</div>\n' % indentation(col)
+    return html
+
 def display(env, curpage, toc, col):
-    html = '%s<ul>\n' % ( indentation(col) )
+    html = ''
+    html += '%s<ul>\n' % indentation(col)
     col += 1
     for name, title, sub in toc: