Layout and docs.

7 files changed, 77 insertions, 80 deletions

diff --git a/libpathod/templates/about.html b/libpathod/templates/about.html
index 602357f7..0eae4865 100644
--- a/libpathod/templates/about.html
+++ b/libpathod/templates/about.html
@@ -1,32 +1,30 @@
 {% extends "frame.html" %}
 {% block body %}  
 
-<section>
-    <div class="page-header">
-        <h1>
-            why
-            <small>this was written.</small>
-        </h1>
-    </div>
-
-    <p>I started pathod to improve testing for for the <a
-    href="http://mitmproxy.org">mitmproxy</a> project. From there, it soon grew
-    into a versatile HTTP Swiss army knife in its own right.</p>
-</section>
-
 
 <section>
-    <div class="page-header">
-        <h1>
-            who
-            <small>is to blame.</small>
-        </h1>
-    </div>
+<div class="page-header">
+    <h1>
+        About
+    </h1>
+</div>
+<div class="row">
+    <div class="span6">
+        <div>
+            <p>pathod is developed by <a href="http://corte.si">Aldo
+            Cortesi</a>.</p>
+        </div>
 
-    <p>pathod is developed by me, <a href="http://corte.si">Aldo Cortesi</a>.
-    Email me at aldo@corte.si with feedback or suggestions. If you like pathod, you
-    should follow me on <a href="http://twitter.com/cortesi">twitter</a> and <a
-    href="http://corte.si">subscribe to my blog</a>.</p>
+        <div>
+            <ul>
+                <li>email: <a href="mailto:aldo@corte.si">aldo@corte.si</a></li>
+                <li>twitter: <a href="http://twitter.com/cortesi">@cortesi</a></li>
+                <li>app.net: <a href="https://alpha.app.net/cortesi">@cortesi</a></li>
+                <li>github: <a href="https://github.com/cortesi">github.com/cortesi</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
 </section>
 
 
diff --git a/libpathod/templates/index.html b/libpathod/templates/index.html
index 4b52b6a5..074f91f2 100644
--- a/libpathod/templates/index.html
+++ b/libpathod/templates/index.html
@@ -1,21 +1,22 @@
 {% extends "frame.html" %}
 {% block body %}  
 
-<div class="row">
-    <div class="span6 bigtitle">
-        <div>
-            <img src="/static/torture.png">
-        </div>
-    </div>
-    <div class="span6 bigtitle">
-        <div>Tormenting HTTP clients and servers</div>
+
+<div class="masthead">
+    <div class="container">
+        <h1>pathod: pathological HTTP</h1>
+
+        <p>Crafted malice for tormenting HTTP clients and servers</p>
+
+        <img src="/static/torture.png">
     </div>
 </div>
 
+
 <div class="row">
     <div class="span6">
         <div>
-            <h1> <a href="/docs/pathod">pathod</a> </h1>
+            <h2> <a href="/docs/pathod">pathod</a> </h2>
 
             <p>A pathological web daemon.</p>
 
@@ -23,47 +24,46 @@
 
             <br>
 
-            <p>There is also a live, public instance of pathod here:</p>
-
-            <p><b>http://public.pathod.net/</b><input 
-                    style="width: 14em"
-                    id="publicspec"
-                    name="spec"
-                    class="input-medium search-query"
-                    value="{{spec}}"
-                    placeholder="code:[features]"
-                >
-                <a id="gopublic" class="btn">go</a>
-            </p>
-            
-            <p>Please use responsibly. There are some restrictions on the
-            public server.</p>
-
-            <script>
-                $(function(){
-                    $("#gopublic").click(function(){
-                        document.location = "http://public.pathod.net/" + $("#publicspec").val()
-                    });
-                });
-            </script>
-
         </div>
     </div>
     <div class="span6">
         <div>
-            <h1> <a href="/docs/pathoc">pathoc</a> </h1>
+            <h2> <a href="/docs/pathoc">pathoc</a> </h2>
 
             <p>A perverse HTTP client.</p>
 
             {% include "request_previewform.html" %}
 
-            <pre class="terminal">&gt; pathoc -n 3 google.com "get:/:ir,@1"
-&lt;&lt; 200 OK: 44177 bytes
-&lt;&lt; 405 Method Not Allowed: 959 bytes
-&lt;&lt; 200 OK: 44107 bytes</pre>
+        </div>
+    </div>
+</div>
 
+<section>
+<div class="page-header">
+    <h1>Install</h1>
+</div>
+<div class="row">
+    <div class="span6">
+        <div>
+            <h2>pip</h2>
+
+            <pre>pip install pathod</pre>
+
+        </div>
+    </div>
+    <div class="span6">
+        <div>
+            <h2>source</h2>
+
+            <ul>
+                <li>Current release: <a href="">pathod 0.9</a></li>
+
+                <li>GitHub: <a href="http://github.com/cortesi/pathod">github.com/cortesi/pathod</a></li>
+            </li>
         </div>
     </div>
 </div>
+</section>
+
 
 {% endblock %}  
diff --git a/libpathod/templates/layout.html b/libpathod/templates/layout.html
index 4ab0b464..5a6bd3ef 100644
--- a/libpathod/templates/layout.html
+++ b/libpathod/templates/layout.html
@@ -39,7 +39,6 @@
           <div class="nav-collapse">
             <ul class="nav">
               <li {% if section== "main" %} class="active" {% endif %}><a href="/">home</a></li>
-              <li {% if section== "download" %} class="active" {% endif %}><a href="/download">download</a></li>
               {% if not noapi %}
               <li {% if section== "log" %} class="active" {% endif %}><a href="/log">log</a></li>
               {% endif %}
diff --git a/libpathod/templates/request_preview.html b/libpathod/templates/request_preview.html
index db08580e..2717a9b8 100644
--- a/libpathod/templates/request_preview.html
+++ b/libpathod/templates/request_preview.html
@@ -6,8 +6,8 @@
 </div>
 
 <div style="margin-bottom: 20px" class="row">
-    <div class="span2">
-        <h3>Specification:</h3>
+    <div class="span2 header">
+        Specification:
     </div>
     <div class="span10">
         {% include "request_previewform.html" %}
@@ -16,8 +16,8 @@
 
 {% if syntaxerror %}
     <div class="row">
-        <div class="span2">
-            <h3>Error:</h3>
+        <div class="span2 header">
+            Error:
         </div>
         <div class="span10">
             <p style="color: #ff0000">{{ syntaxerror }}</p>
@@ -26,8 +26,8 @@
     </div>
 {% elif error %}
     <div class="row">
-        <div class="span2">
-            <h3>Error:</h3>
+        <div class="span2 header">
+            Error:
         </div>
         <div class="span10">
             <p style="color: #ff0000">{{ error }}</p>
@@ -35,8 +35,8 @@
     </div>
 {% else %}
     <div class="row">
-        <div class="span2">
-            <h3>Request:</h3>
+        <div class="span2 header">
+            Request:
         </div>
         <div class="span10">
             <pre>{{ output }}</pre>
diff --git a/libpathod/templates/request_previewform.html b/libpathod/templates/request_previewform.html
index 78884145..607bfefd 100644
--- a/libpathod/templates/request_previewform.html
+++ b/libpathod/templates/request_previewform.html
@@ -3,7 +3,7 @@
         style="width: 18em"
         id="spec"
         name="spec"
-        class="input-medium search-query"
+        class="input-medium"
         value="{{spec}}"
         placeholder="method:path:[features]"
     >
diff --git a/libpathod/templates/response_preview.html b/libpathod/templates/response_preview.html
index bb72513d..ce6a4098 100644
--- a/libpathod/templates/response_preview.html
+++ b/libpathod/templates/response_preview.html
@@ -6,8 +6,8 @@
 </div>
 
 <div style="margin-bottom: 20px" class="row">
-    <div class="span2">
-        <h3>Specification:</h3>
+    <div class="span2 header">
+        Specification:
     </div>
     <div class="span10">
         {% include "response_previewform.html" %}
@@ -16,8 +16,8 @@
 
 {% if syntaxerror %}
     <div class="row">
-        <div class="span2">
-            <h3>Error:</h3>
+        <div class="span2 header">
+            Error:
         </div>
         <div class="span10">
             <p style="color: #ff0000">{{ syntaxerror }}</p>
@@ -26,8 +26,8 @@
     </div>
 {% elif error %}
     <div class="row">
-        <div class="span2">
-            <h3>Error:</h3>
+        <div class="span2 header">
+            Error:
         </div>
         <div class="span10">
             <p style="color: #ff0000">{{ error }}</p>
@@ -35,8 +35,8 @@
     </div>
 {% else %}
     <div class="row">
-        <div class="span2">
-            <h3>Response:</h3>
+        <div class="span2 header">
+            Response:
         </div>
         <div class="span10">
             <pre>{{ output }}</pre>
diff --git a/libpathod/templates/response_previewform.html b/libpathod/templates/response_previewform.html
index 7f72aaeb..ee2ec4d8 100644
--- a/libpathod/templates/response_previewform.html
+++ b/libpathod/templates/response_previewform.html
@@ -3,7 +3,7 @@
         style="width: 18em"
         id="spec"
         name="spec"
-        class="input-medium search-query"
+        class="input-medium"
         value="{{spec}}"
         placeholder="code:[features]"
     >