Changeset 2934

Timestamp:

03/24/05 18:12:29 (8 years ago)

Author:

hauma

Message:

• Adjusted the look and feel of the active line in the TracNav navigation bar. Now, the whole line is highlighted no matter of the level of indentation. Unfortunately, this requires to generate a flat unordered list in HTML with direct style directives for indentation.

Location:

trac/trunk

Files:

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

trac/trunk/htdocs/css/wiki.css

@@ -40 +40 @@
 /* Styles for TracNav */
 .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

@@ -24 +24 @@
 /* Styles for TracNav */
 .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; }
@@ -193 +191 @@
     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)
+    html += '%s<ul>\n' % indentation(col)
+    col += 1
+    html += display(env, curpage, toc, 0, col)
+    col -= 1
+    html += '%s</ul>\n' % indentation(col)
     col -= 1
     html += '%s</div>\n' % indentation(col)
     return html
 
-def display(env, curpage, toc, col):
+def display(env, curpage, toc, depth, col):
     html = ''
-    html += '%s<ul>\n' % indentation(col)
-    col += 1
     for name, title, sub in toc:
+        liStyle = ' style="padding-left: %dem;"' % (depth + 1)
         if sub == None:
             if name == curpage:
@@ -208 +209 @@
             else:
                 cls = ''
-            html += '%s<li%s>' % (indentation(col), cls)
+            html += '%s<li%s%s>' % (indentation(col), liStyle, cls)
             if name == None:
                 html += title
@@ -215 +216 @@
             html += '</li>\n'
         else:
-            html += '%s<li>\n' % indentation(col)
+            html += '%s<li%s>\n' % (indentation(col), liStyle)
             col += 1
             if name == None or len(sub) > 0:
@@ -221 +222 @@
             else:
                 html += '%s<h4><a href="%s">%s...</a></h4>\n' % (indentation(col), env.href.wiki(name), title)
-            if len(sub) > 0:
-                html += display(env, curpage, sub, col)
             col -= 1
             html += '%s</li>\n' % indentation(col)
-    col -= 1
-    html += '%s</ul>\n' % indentation(col)
+            if len(sub) > 0:
+                html += display(env, curpage, sub, depth + 1, col)
     return html