From dc59325329c345dac70aad0b8245371338356cce Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 19 Jan 2014 17:40:26 +1300
Subject: Refactor docs to define nav sidebar in only one place.

---
 doc-src/_websitelayout.html | 48 ++-------------------------------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

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

diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
index 3e9dfad7..cd0d23e2 100644
--- a/doc-src/_websitelayout.html
+++ b/doc-src/_websitelayout.html
@@ -6,7 +6,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </a>
-      <a class="brand" href="@!urlTo('/index.html')!@">mitmproxy</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>
@@ -23,51 +23,7 @@
 
     <div class="span3">
       <div class="well sidebar-nav">
-        <ul class="nav nav-list">
-            $!nav(idxpath, this, state)!$
-            $!nav("install.html", this, state)!$
-            $!nav("howmitmproxy.html", this, state)!$
-
-            <li class="nav-header">Tools</li>
-                $!nav("mitmproxy.html", this, state)!$
-                $!nav("mitmdump.html", this, state)!$
-
-            <li class="nav-header">Features</li>
-                $!nav("anticache.html", this, state)!$
-                $!nav("clientreplay.html", this, state)!$
-                $!nav("filters.html", this, state)!$
-                $!nav("proxyauth.html", this, state)!$
-                $!nav("replacements.html", this, state)!$
-                $!nav("serverreplay.html", this, state)!$
-                $!nav("setheaders.html", this, state)!$
-                $!nav("sticky.html", this, state)!$
-                $!nav("reverseproxy.html", this, state)!$
-                $!nav("upstreamcerts.html", this, state)!$
-
-            <li class="nav-header">SSL interception</li>
-                $!nav("ssl.html", this, state)!$
-                $!nav("certinstall/firefox.html", this, state)!$
-                $!nav("certinstall/osx.html", this, state)!$
-                $!nav("certinstall/windows7.html", this, state)!$
-                $!nav("certinstall/ios.html", this, state)!$
-                $!nav("certinstall/android.html", this, state)!$
-
-            <li class="nav-header">Transparent Proxying</li>
-                $!nav("transparent.html", this, state)!$
-                $!nav("transparent/linux.html", this, state)!$
-                $!nav("transparent/osx.html", this, state)!$
-
-             <li class="nav-header">Tutorials</li>
-                $!nav("tutorials/30second.html", this, state)!$
-                $!nav("tutorials/gamecenter.html", this, state)!$
-
-            <li class="nav-header">Scripting mitmproxy</li>
-                $!nav("scripting/inlinescripts.html", this, state)!$
-                $!nav("scripting/libmproxy.html", this, state)!$
-
-            <li class="nav-header">Hacking</li>
-                $!nav("dev/testing.html", this, state)!$
-        </ul>
+            $!navbar!$
       </div>
     </div>
     <div class="span9">
-- 
cgit v1.2.3


From 8f88fcedd601c0033b4469b66626a83011879baf Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 22 Jan 2014 13:33:02 +1300
Subject: Move the doc tree out into its own repo.

---
 doc-src/_websitelayout.html | 42 ------------------------------------------
 1 file changed, 42 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 cd0d23e2..00000000
--- a/doc-src/_websitelayout.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
-    <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>
-  </div>
-</div>
-
-<div class="container">
-  <div class="row">
-
-    <div class="span3">
-      <div class="well sidebar-nav">
-            $!navbar!$
-      </div>
-    </div>
-    <div class="span9">
-        <div class="page-header">
-        <h1>@!this.title!@</h1>
-        </div>
-        $!body!$
-    </div>
-  </div>
-
-  <hr>
-
-  <footer>
-    <p>@!copyright!@</p>
-  </footer>
-</div>
-- 
cgit v1.2.3