From 6685c27697e4ffbe55ec8dc8f4f9b6043975239a Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 20 May 2015 13:12:41 +1200
Subject: docs: first-pass conversion to bootstrap3

Crappy default styling for now.
---
 doc-src/_websitelayout.html | 64 +++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 25 deletions(-)

(limited to 'doc-src/_websitelayout.html')

diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
index cd0d23e2..92bf7bc7 100644
--- a/doc-src/_websitelayout.html
+++ b/doc-src/_websitelayout.html
@@ -1,42 +1,56 @@
-<div class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
+<div class="navbar navbar-default navbar-static-top">
     <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-      <a class="brand" href="@!urlTo(idxpath)!@">mitmproxy</a>
-      <div class="nav">
-        <ul class="nav">
-          <li $!'class="active"' if this.match("/index.html", True) else ""!$> <a href="@!top!@/index.html">home</a> </li>
-          <li $!'class="active"' if this.under("/doc") else ""!$><a href="@!top!@/doc/index.html">docs</a></li>
-          <li $!'class="active"' if this.under("/about.html") else ""!$><a href="@!top!@/about.html">about</a></li>
-        </ul>
-      </div>
+        <div class="navbar-header">
+            <button type="button"
+                    class="navbar-toggle collapsed"
+                    data-toggle="collapse"
+                    data-target="#bs-example-navbar-collapse-1"
+            >
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="@!urlTo("/index.html")!@">mitmproxy</a>
+        </div>
+
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav">
+                <li $!'class="active"' if this.under("/index.html") else ""!$> <a href="@!top!@/index.html">home</a> </li>
+                <li $!'class="active"' if this.under("/doc") else ""!$><a href="@!top!@/doc/index.html">docs</a></li>
+                <li $!'class="active"' if this.under("/about.html") else ""!$><a href="@!top!@/about.html">about</a></li>
+            </ul>
+        </div>
     </div>
-  </div>
 </div>
 
 <div class="container">
   <div class="row">
-
-    <div class="span3">
-      <div class="well sidebar-nav">
-            $!navbar!$
-      </div>
+    <div class="col-md-3">
+        $!navbar!$
     </div>
-    <div class="span9">
+    <div class="col-md-9">
         <div class="page-header">
         <h1>@!this.title!@</h1>
         </div>
         $!body!$
     </div>
   </div>
+</div>
 
-  <hr>
-
+<div class="container">
   <footer>
-    <p>@!copyright!@</p>
+    <hr>
+    <p>Copyright 2014 Aldo Cortesi</p>
   </footer>
 </div>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-4150636-13']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
-- 
cgit v1.2.3


From f816246f4eae78a5fb0626f753e5210fcbe9e82f Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 22 May 2015 11:21:00 +1200
Subject: doc: fix nav in website mode

---
 doc-src/_websitelayout.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc-src/_websitelayout.html')

diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
index 92bf7bc7..5a7c01bb 100644
--- a/doc-src/_websitelayout.html
+++ b/doc-src/_websitelayout.html
@@ -16,9 +16,9 @@
 
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav">
-                <li $!'class="active"' if this.under("/index.html") else ""!$> <a href="@!top!@/index.html">home</a> </li>
-                <li $!'class="active"' if this.under("/doc") else ""!$><a href="@!top!@/doc/index.html">docs</a></li>
-                <li $!'class="active"' if this.under("/about.html") else ""!$><a href="@!top!@/about.html">about</a></li>
+                <li> <a href="@!top!@/index.html">home</a> </li>
+                <li class="active"><a href="@!top!@/doc/index.html">docs</a></li>
+                <li><a href="@!top!@/about.html">about</a></li>
             </ul>
         </div>
     </div>
-- 
cgit v1.2.3


From b91999507e662cbcce6c7968647d8cbac54fbcb5 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 23 May 2015 12:36:52 +1200
Subject: Move websitelayout to website.

---
 doc-src/_websitelayout.html | 56 ---------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 doc-src/_websitelayout.html

(limited to 'doc-src/_websitelayout.html')

diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
deleted file mode 100644
index 5a7c01bb..00000000
--- a/doc-src/_websitelayout.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button"
-                    class="navbar-toggle collapsed"
-                    data-toggle="collapse"
-                    data-target="#bs-example-navbar-collapse-1"
-            >
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="@!urlTo("/index.html")!@">mitmproxy</a>
-        </div>
-
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav">
-                <li> <a href="@!top!@/index.html">home</a> </li>
-                <li class="active"><a href="@!top!@/doc/index.html">docs</a></li>
-                <li><a href="@!top!@/about.html">about</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-md-3">
-        $!navbar!$
-    </div>
-    <div class="col-md-9">
-        <div class="page-header">
-        <h1>@!this.title!@</h1>
-        </div>
-        $!body!$
-    </div>
-  </div>
-</div>
-
-<div class="container">
-  <footer>
-    <hr>
-    <p>Copyright 2014 Aldo Cortesi</p>
-  </footer>
-</div>
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-4150636-13']);
-  _gaq.push(['_trackPageview']);
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
-- 
cgit v1.2.3