Merge pull request #115 from mattfelsen/master

TOC: Run through pandoc to pick up styling, moved into chapters folder

Author: ofZach

scripts/createWebBook.py

@@ -400,18 +400,16 @@ def returnChapterByCommonName( commonName ):
 	#print html
 
 
-#----------------------------------------------------- make TOC
+#----------------------------------------------------- make TOC content
 
 soup = Soup()
-html = Tag(soup, None, "html")
 a = Tag(soup, None, "a")
-soup.append(html)
 
 for c in chapterDicts: 
 	ul = Tag(soup, None, "ul")
 	li = Tag(soup, None, "li")
 	a = Tag(soup, None, "a");
-	a['href'] = "chapters/" + c['path'] + ".html"
+	a['href'] = c['path'] + ".html"
 	a.string = c['title']
 	li.append(a)
 	ul.append(li)
@@ -431,16 +429,13 @@ def returnChapterByCommonName( commonName ):
 			liInner.append(a);
 		#print "\t" + tag
 
-	html.append(ul);
+	soup.append(ul);
 
 htmlOut = soup.prettify("utf-8")
 tocPath = os.path.join(webBookPath, "toc.html")
 with open(tocPath, "wb") as file:
     file.write(htmlOut)
 
-
-
-
 # <ul>
 #   <li>Coffee</li>
 #   <li>Tea
@@ -452,5 +447,24 @@ def returnChapterByCommonName( commonName ):
 #   <li>Milk</li>
 # </ul>
 
+#----------------------------------------------------- run pandoc for TOC
+
+destTocPath = os.path.join(webBookPath, "chapters", "toc.html")
+sourceTocPath = os.path.join(webBookPath, "toc.html")
+
+print "Converting", sourceTocPath, "to", destTocPath, "..."
+
+subprocess.call(["pandoc", "-o", destTocPath, sourceTocPath,
+                                    "-s", "-p",
+                                    "--include-in-header=createWebBookTemplate/IncludeInHeader.html",
+                                    "--include-before-body=createWebBookTemplate/IncludeBeforeBodyTOC.html",
+                                    "--include-after-body=createWebBookTemplate/IncludeAfterBodyTOC.html"])
+
+print "Removing", sourceTocPath, "..."
+os.remove(sourceTocPath)
+
+
+
+
 
 

scripts/createWebBookTemplate/IncludeAfterBodyTOC.html

@@ -0,0 +1,10 @@
+			</p>
+            <div class="footer">
+                <div id="prev_chapter"></div>
+                <div id="next_chapter"></div>
+            </div>
+            <div id="help"><i>please note that this book / chapter is a work in progress.  Feel free to suggest edits / corrections <a href="https://github.com/openframeworks/ofbook">here</a></i></div>
+        </div>
+    </div>
+</body>
+</html>

scripts/createWebBookTemplate/IncludeBeforeBodyTOC.html

@@ -0,0 +1,11 @@
+<div class="banner">
+    <div class="content-wrapper">
+        <b>Work in progress!</b>
+        This is a preliminary version of ofBook, a collaboratively written book about openFrameworks.  Please post any issues, suggestions, comments on our <a href="https://github.com/openframeworks/ofBook/">repo</a>.
+    </div>
+</div>
+
+<div class="content-wrapper">
+    <div class="chapter-content toc">
+	    <h1>Table of Contents</h1>
+	        <p>

static/style/style.scss

@@ -176,11 +176,11 @@ a:active {
 
 }
 
-#chapters, #toc {
+#chapters {
   display:none;
 }
 
-.chapter-content {
+.chapter-content, .toc {
   width: 734px;
   margin-top:70px;
   background-color: rgba(255,255,255,1);
@@ -374,6 +374,10 @@ a:active {
   }
 }
 
+.toc {
+  width: 980px;
+  margin-left: 0px;
+}
 
 #help {
   font-family: 'fira';