Changeset 2931

Timestamp:

03/24/05 16:50:41 (8 years ago)

Author:

hauma

Message:

• Fancified HTML output with line breaks and indentation.

File:

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

trac/trunk/wiki-macros/TracNav.py

@@ -151 +151 @@
         if (hdf.getValue('trac.acl.WIKI_MODIFY', '')):
             msg += ' Click here to <a href="%s?edit=yes">edit</a>.' % env.href.wiki(name)
-        msg += '</strong></div>'
+        msg += '</strong></div>\n'
         return msg
 
     html = ''
-    html += '<div class="wiki-toc trac-nav">'
+    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>' % env.href.wiki(name)
+        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)
+        html += display(env, curpage, filtered, 1)
     else:
-        html += display(env, curpage, toc)
-    html += '</div>'
+        html += display(env, curpage, toc, 1)
+    html += '</div>\n'
     return html
 
@@ -189 +189 @@
     return (found, result)
 
-
-def display(env, curpage, toc):
-    html = '<ul>'
+def indentation(col):
+    return ' ' * col
+
+def display(env, curpage, toc, col):
+    html = '%s<ul>\n' % ( indentation(col) )
+    col += 1
     for name, title, sub in toc:
         if sub == None:
@@ -198 +201 @@
             else:
                 cls = ''
-            html += '<li%s>' % ( cls )
+            html += '%s<li%s>' % (indentation(col), cls)
             if name == None:
                 html += title
             else:
                 html += '<a href="%s">%s</a>' % (env.href.wiki(name), title)
-            html += '</li>'
-        else:
-            html += '<li>'
+            html += '</li>\n'
+        else:
+            html += '%s<li>\n' % indentation(col)
+            col += 1
             if name == None or len(sub) > 0:
-                html += '<h4>%s</h4>' % title
-            else:
-                html += '<h4><a href="%s">%s...</a></h4>' % (env.href.wiki(name), title)
-            html += display(env, curpage, sub)
-            html += '</li>'
-    html += '</ul>'
+                html += '%s<h4>%s</h4>\n' % (indentation(col), title)
+            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)
     return html