Slight improvements to the CSS, simplification

[ardour-manual] / build.py

diff --git a/build.py b/build.py
index dbe5448e56bdf85a8b9c42ddd07a9a3e586e59ec..376204959f810b72d7c5bfe126233c36b2346e01 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -312,15 +312,15 @@ def FixInternalLinks(links, content, title):
 # looking at currently
 #
 def BuildList(lst, fs, pagePos, cList):
-       content = '\n\n<dl>\n'
+       content = '\n\n<ul>\n'
 
        for i in range(len(lst)):
                curPos = lst[i]
-               nextPos = lst[i + 1] if i + 1 < len(lst)  else len(fs)
+               nextPos = lst[i + 1] if i + 1 < len(lst) else len(fs)
 
                active = ' class=active' if curPos == pagePos else ''
                menuTitle = fs[curPos]['menu_title'] if 'menu_title' in fs[curPos] else fs[curPos]['title']
-               content = content + '<dt' + active + '><a href="/' + fs[curPos]['filename'] + '/">' + menuTitle + '</a></dt><dd' + active + '>'
+               content = content + '<li' + active + '><a href="/' + fs[curPos]['filename'] + '/">' + menuTitle + '</a></li>'
 
                # If the current page is our page, and it has children, enumerate them
                if curPos == pagePos:
@@ -332,9 +332,7 @@ def BuildList(lst, fs, pagePos, cList):
                elif (pagePos > curPos) and (pagePos < nextPos):
                        content = content + BuildList(cList[curPos], fs, pagePos, cList)
 
-               content = content + '</dd>\n'
-
-       content = content + '</dl>\n'
+       content = content + '\n</ul>\n'
 
        return content
 
@@ -398,10 +396,10 @@ def BuildOnePageSidebar(fs):
 def CreateLinkSidebar(fs, pos, childList):
 
        # Build the list recursively from the top level nodes
-       #content = BuildList(FindTopLevelNodes(fs), fs, pos, childList)
        content = BuildList(FindTopLevelNodes(fs), fs, pos, childList)
        # Shove the TOC link and one file link at the top...
-       content = content[:7] + '<dt><dt><a href="/toc/">Table of Contents</a></dt><dd></dd>\n' + content[7:]
+       active = ' class=active' if pos<0 else ''
+       content = content.replace('<ul>','<ul><li' + active + '><a href="/toc/">Table of Contents</a></li>\n',1)
 
        return content