Changeset 3071 for trac/trunk

Timestamp:

02/22/06 17:10:28 (7 years ago)

Author:

moschny

Message:

Apply a patch from Christophe Eymard <pwipwi.thecow@…> that
adds the ability to combine more than one wiki page to form the toc.

The CSS needs some fixing, though. Gecko-based browsers now render the
trac-nav box with page width.

Location:

trac/trunk

Files:

• htdocs/tracnav.css (modified) (2 diffs)
• wiki-macros/TracNav.py (modified) (4 diffs)

trac/trunk/htdocs/tracnav.css

@@ -40 +40 @@
 }
 .wiki-toc.trac-nav h4 {
- margin: 0; padding: 0;
+ margin: 0;
+ padding: 0;
 }
 .wiki-toc.trac-nav ul > li:first-child {
@@ -46 +47 @@
 }
 .wiki-toc.trac-nav .edit {
- position: absolute;
- top: 2px;
- right: 3px;
- margin-left: 3px;
- border: 0;
+ /* FIXME: this causes Gecko-based browsers to 
+    stretch trac-nav box over the whole page */
+ float: right;
+ text-align: right;
 }
 .wiki-toc.trac-nav .edit a {
- color:blue; border-color:blue;
+ color: blue;
+ border-color: blue;
 }

trac/trunk/wiki-macros/TracNav.py

@@ -45 +45 @@
 == Author and license ==
 
-Copyright 2005
+Copyright 2005, 2006
  *  Bernhard Haumacher (haui at haumacher.de)
  *  Thomas Moschny (moschny at ipd.uni-karlsruhe.de)
@@ -197 +197 @@
     preview = hdf.getValue('args.preview', "")
     curpage = hdf.getValue('wiki.page_name', "")
-    name = args or 'TOC'
-
-    toc = parse_toc(get_toc(hdf, env, preview, name), env)
-    if not toc:
-        toc = parse_toc(' * TOC "%s" is empty!' % name, env)
-
-    (found, filtered) = filter_toc(curpage, toc, 0)
-    if found:
-        return display_all(hdf, env, name, curpage, filtered, 0)
-    else:
-        return display_all(hdf, env, name, curpage, toc, 0)
+
+    # split the argument to get the wiki page names to include
+    names = (args or "TOC").split('|')
+
+    # Parsing the tocS
+    tocs = []
+    for name in names:
+        toc = parse_toc(get_toc(hdf, env, preview, name), env)
+        if not toc:
+            toc = parse_toc(' * TOC "%s" is empty!' % name, env)
+        tocs.append((name, toc))
+
+    col = 0
+    html = '%s<div class="wiki-toc trac-nav">\n' % indentation(col)
+    col += 1
+    html += '%s<h2><a href="%s">TracNav</a> menu</h2>' % \
+            (indentation(col), TRACNAVHOME)
+
+    for name, toc in tocs:
+        (found, filtered) = filter_toc(curpage, toc, 0)
+        if found:
+            html += display_all(hdf, env, name, curpage, filtered, col)
+        else:
+            html += display_all(hdf, env, name, curpage, toc, col)
+    col -= 1
+    html += '%s</div>\n' % indentation(col)
+    return html
+
 
 
@@ -238 +255 @@
 def display_all(hdf, env, name, curpage, toc, col):
     preview = hdf.getValue('args.preview', "")
-    html = '%s<div class="wiki-toc trac-nav">\n' % indentation(col)
-    col += 1
-    html += '%s<h2><a href="%s">TracNav</a> menu</h2>' % \
-            (indentation(col), TRACNAVHOME)
+    html = ''
 
     if (not preview) and hdf.getValue('trac.acl.WIKI_MODIFY', ''):
@@ -251 +265 @@
     col -= 1
     html += '%s</ul>\n' % indentation(col)
-    col -= 1
-    html += '%s</div>\n' % indentation(col)
     return html