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: [PATCH] Move websitelayout to website.

---
 doc-src/_websitelayout.html | 56 -------------------------------------
 doc-src/index.py            |  3 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 doc-src/_websitelayout.html

diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
deleted file mode 100644
index 5a7c01bb5..000000000
--- 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>
diff --git a/doc-src/index.py b/doc-src/index.py
index 52b9c31a4..b049e3ce1 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -15,10 +15,9 @@ ns.VERSION = version.VERSION
 
 if ns.options.website:
     ns.idxpath = "doc/index.html"
-    this.layout = countershape.Layout("_websitelayout.html")
 else:
     ns.idxpath = "index.html"
-    this.layout = countershape.Layout("_layout.html")
+this.layout = countershape.Layout("_layout.html")
 
 ns.title = countershape.template.Template(None, "<h1>@!this.title!@</h1>")
 this.titlePrefix = "%s - " % version.NAMEVERSION