A bit of styling for the 1-page version

diff --git a/build.py b/build.py
index 828b5d107bcedf9db4b9370886082a0820d76720..df16505ecb95b75dab47a2ca526b86fd418b01c2 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -496,6 +496,7 @@ for header in fileStruct:
 
        # Handle TOC scriblings and one-page titles...
        opl = ''
+
        if 'link' in header:
                opl = ' id="' + header['link'] + '"'
        else:
@@ -503,19 +504,19 @@ for header in fileStruct:
 
        if level == 0:
                toc = toc + '<h2>Part ' + num2roman(levelNums[level]) + ': ' + header['title'] + '</h2>\n';
-               oph = '<h1 class="clear"' + opl +'>Part ' + num2roman(levelNums[level]) + ': ' + header['title'] + '</h1>\n';
+               oph = '<h1 class="clear"' + opl +'>' + num2roman(levelNums[level]) + ' - ' + header['title'] + '</h1>\n';
        elif level == 1:
-               toc = toc + '  <p class="chapter">Ch. ' + str(levelNums[level]) + ':&nbsp;&nbsp;<a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
-               oph = '<h1 class="clear"' + opl +'>Chapter ' + str(levelNums[level]) + ': ' + header['title'] + '</h1>\n';
+               toc = toc + '\t<p class="chapter">Ch. ' + str(levelNums[level]) + ':&nbsp;&nbsp;<a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
+               oph = '<h1 class="clear"' + opl +'>' + str(levelNums[level-1]) + '.' + str(levelNums[level]) + ' - ' + header['title'] + '</h1>\n';
        elif level == 2:
-               toc = toc + '    <p class="subchapter"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
-               oph = '<h1 class="clear"' + opl +'>Subchapter ' + str(levelNums[level]) + ': ' + header['title'] + '</h1>\n';
+               toc = toc + '\t\t<p class="subchapter"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
+               oph = '<h1 class="clear"' + opl +'>' + str(levelNums[level-2]) + '.' + str(levelNums[level-1]) + '.' + str(levelNums[level]) + ' - ' + header['title'] + '</h1>\n';
        elif level == 3:
-               toc = toc + '      <p class="section"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
-               oph = '<h1 class="clear"' + opl +'>Section ' + str(levelNums[level]) + ': ' + header['title'] + '</h1>\n';
+               toc = toc + '\t\t\t<p class="section"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
+               oph = '<h1 class="clear"' + opl +'>' + str(levelNums[level-3]) + '.' + str(levelNums[level-2]) + '.' + str(levelNums[level-1]) + '.' + str(levelNums[level]) + ' - ' + header['title'] + '</h1>\n';
        elif level == 4:
-               toc = toc + '      <p class="subsection"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
-               oph = '<h1 class="clear"' + opl +'>Subsection ' + str(levelNums[level]) + ': ' + header['title'] + '</h1>\n';
+               toc = toc + '\t\t\t\t<p class="subsection"><a href="/' + header['filename'] + '/">' + header['title'] + '</a></p>\n'
+               oph = '<h1 class="clear"' + opl +'>' + str(levelNums[level-4]) + '.'  + str(levelNums[level-3]) + '.'  + str(levelNums[level-2]) + '.'  + str(levelNums[level-1]) + '.' + str(levelNums[level]) + ' - ' + header['title'] + '</h1>\n';
 
 
 
@@ -653,6 +654,7 @@ tocFile.close()
 
 # Create the one-page version of the documentation
 onepageFile = open(siteDir + 'ardourmanual.html', 'w')
+onepage = onepage.replace('{{ content }}', '') # cleans up the last spaceholder
 onepageFile.write(onepage)
 onepageFile.close()
 

diff --git a/onepage-template.txt b/onepage-template.txt
index d3a2f2b04d069fec8a5ab3a1c1dc604fb3203746..bd7176e4c87a2417388692c400842d42382ba867 100644 (file)
--- a/onepage-template.txt
+++ b/onepage-template.txt
@@ -9,30 +9,28 @@
 
        <link href="{{page.bootstrap_path}}/css/bootstrap.min.css" rel="stylesheet">
        <link href="/css/app.css" rel="stylesheet">
-{% if page.style %}
-       <link href="/css/{{page.style}}.css" rel="stylesheet">
-{% endif %}
+
 </head>
 
 <body>
-<div class="container-fluid"><div class="row-fluid">
-       <div id="tree"><div id="tree-inner">
-               <h1 class="title"><a href="/"><img class="img-responsive" src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
-               <div class="menu-list">
-               {% tree %}
-               </div>
+<div class="container-fluid">
+       <div class="row-fluid">
+               <div id="tree" class="navbar">
+                               <h1 class="title"><a href="/"><img class="img-responsive" src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
 
-       </div></div>
-       <div class="span12" id="content">
-               <div id="content-main">
+                               {% tree %}
+
+               </div>
 
-                       {{ content }}
+               <div class="span12" id="content">
+                       <div id="content-main">
 
-                       <div class="clearer"></div>
+                               {{ content }}
 
+                       </div>
                </div>
        </div>
-</div></div>
+</div>
 
 
 <script type="text/javascript">

diff --git a/source/css/app.css b/source/css/app.css
index 5c0ccca98c3287d408bfb5f78fe8fb4b86ebb141..5abbe55abe3dfe7301c0dd04096c679b3c6d9db2 100644 (file)
--- a/source/css/app.css
+++ b/source/css/app.css
@@ -49,6 +49,11 @@ ul.inside li, ol.inside li {
   margin-left: 1em;
 }
 
+#tree ul {
+  padding-left: 1em;
+  list-style-type: none;
+}
+
 #tree h1.title a:hover {
   border-bottom: none;
 }