X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build.py;h=4d09afe19eb32637da05620290739c7ae848ec37;hb=b818a4a21376b64fe83a532564f66e2ad8f560af;hp=127f43f84b01cfd19a8aaebc3de76275a99c0bdc;hpb=fdf05235b45a22d8708464841162f396ea49dc86;p=ardour-manual

diff --git a/build.py b/build.py
index 127f43f..4d09afe 100755
--- a/build.py
+++ b/build.py
@@ -9,7 +9,7 @@
 
 # Remnants (could go into the master document as the first header)
 
-#bootstrap_path: /bootstrap-2.2.2
+#bootstrap_path: /bootstrap-3.3.7
 #page_title: The Ardour Manual
 
 import os
@@ -188,6 +188,7 @@ def GetChildren(fs, pos):
 
 	return children
 
+
 #
 # Get the parent at this level
 #
@@ -195,25 +196,29 @@ def GetParent(fs, pos):
 	thisLevel =  fs[pos]['level']
 	pos = pos - 1
 
-	while fs[pos]['level'] >= thisLevel and pos > 0:
+	while pos >= 0 and fs[pos]['level'] >= thisLevel:
 		pos = pos - 1
 
 	return pos
 
+
 #
 # Creates the BreadCrumbs
 #
 def GetBreadCrumbs(fs, pos):
-	breadcrumbs = ' <span class="divider">&gt;</span> <li class="active">'+ fs[pos]['title'] + '</li>'
 	# The <span class="divider">&gt;</span> is for Bootstrap pre-3.0
-	while pos:
-		pos = GetParent(fs,pos)
-		if pos:
-			breadcrumbs=' <span class="divider">&gt;</span> <li><a href="/' + fs[pos]['filename'] + '/">'+ fs[pos]['title'] + '</a></li>'+ breadcrumbs
+	breadcrumbs = '<li class="active">'+ fs[pos]['title'] + '</li>'
+
+	while pos >= 0:
+		pos = GetParent(fs, pos)
 
-	breadcrumbs = '<ol class="breadcrumb"><li><a href="/toc/index.html">Home</a></li>' + breadcrumbs + '</ol>'
+		if pos >= 0:
+			breadcrumbs='<li><a href="/' + fs[pos]['filename'] + '/">'+ fs[pos]['title'] + '</a></li>'+ breadcrumbs
+
+	breadcrumbs = '<ul class="breadcrumb"><li><a href="/toc/index.html">Home</a></li>' + breadcrumbs + '</ul>'
 	return breadcrumbs
 
+
 #
 # Make an array of children attached to each node in the file structure
 # (It's a quasi-tree structure, and can be traversed as such.)
@@ -371,7 +376,7 @@ temp = open('page-template.txt')
 template = temp.read()
 temp.close()
 
-template = template.replace('{{page.bootstrap_path}}', '/bootstrap-2.2.2')
+template = template.replace('{{page.bootstrap_path}}', '/bootstrap-3.3.7')
 template = template.replace('{{page.page_title}}', 'The Ardour Manual')
 
 
@@ -439,13 +444,13 @@ for header in fileStruct:
 	if level == 0:
 		toc = toc + '<h2>Part ' + num2roman(levelNums[level]) + ': ' + header['title'] + '</h2>\n';
 	elif level == 1:
-		toc = toc + '  <p id=chapter>Ch. ' + str(levelNums[level]) + ':&nbsp;&nbsp;<a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
+		toc = toc + '  <p class="chapter">Ch. ' + str(levelNums[level]) + ':&nbsp;&nbsp;<a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
 	elif level == 2:
-		toc = toc + '    <a id=subchapter href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
+		toc = toc + '    <p class="subchapter"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
 	elif level == 3:
-		toc = toc + '      <a id=subchapter href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
+		toc = toc + '      <p class="section"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
 	elif level == 4:
-		toc = toc + '      <a id=subchapter href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
+		toc = toc + '      <p class="subsection"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
 
 	# Make the 'this thing contains...' stuff
 	if HaveChildren(fileStruct, pageNumber):
@@ -508,8 +513,15 @@ for header in fileStruct:
 	content = FixInternalLinks(links, content, header['title'])
 
 	# Add header information to the page if in dev mode
-	if devmode and 'link' in header:
-		content = '<h1>link: ' + header['link'] + '</h1>\n<br><br>\n' + content
+	if devmode:
+		devnote ='<aside style="background-color:indigo; color:white;">'
+		if 'filename' in header:
+			devnote = devnote + 'filename: ' + header['filename'] + '<br>'
+		if 'include' in header:
+			devnote = devnote + 'include: ' + header['include'] + '<br>'
+		if 'link' in header:
+			devnote = devnote + 'link: ' + header['link'] + '<br>'
+		content = devnote + '</aside>' + content
 
 	# Set up the actual page from the template
 	if 'style' not in header: