From 4d3d9103877b5e902cf4445181c08dba10497055 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Mon, 18 Jun 2012 21:44:36 +0100
Subject: [PATCH] [site/theme][s]: refactor navbar extensively in content and
 somewhat in layout plus tweak footer.

---
 _layouts/default.html | 50 ++++++++++++++++++++++++++++++++++++-------
 css/site/site.css     | 10 +++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/_layouts/default.html b/_layouts/default.html
index e251d0d0..5e017112 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -24,13 +24,47 @@
 <div class="navbar navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container">
-      <a class="brand" href="/"><strong>Recline</strong> Data Explorer and Library</a>
-      <ul class="nav pull-right">
-        <li><a href="app/">Data Explorer</a></li>
-        <li><a href="library.html">Data Library</a></li>
-        <li><a href="http://github.com/okfn/recline/">Code on GitHub</a></li>
+      <a class="logo-icon pull-left" href="/">
+        <img src="http://assets.okfn.org/p/recline/img/chair.png" />
+      </a>
+      <a class="brand" href="/"><strong>Recline.js</strong> &ndash; relax with your data</a>
+      <ul class="nav">
+        <li>
+          <a href="library.html">
+            <i class="icon-book icon-white"></i>
+            Documentation
+          </a>
+        </li>
+        <li class="divider-vertical"></li>
+        <li>
+          <a href="demos.html">
+            <i class="icon-pencil icon-white"></i>
+            Demos
+          </a>
+        </li>
+        <li class="divider-vertical"></li>
+        <li>
+          <a href="http://github.com/okfn/recline/">
+            <i class="icon-download-alt icon-white"></i>
+            GitHub
+          </a>
+        </li>
+        <li class="divider-vertical"></li>
+        <li>
+          <a href="http://twitter.com/ReclineJS">
+            <i class="icon-star icon-white"></i>
+            Twitter
+          </a>
+        </li>
+        <li class="divider-vertical"></li>
+        <li>
+          <a href="test/">
+            <i class="icon-ok icon-white"></i>
+            Unit Tests
+          </a>
+        </li>
+        <li class="divider-vertical"></li>
       </ul>
-      
     </div>
   </div>
 </div>
@@ -41,8 +75,8 @@
 	<div class="container">
     <div class="row">
       <div class="span4">
-        <p class="getit-btn"><a href="app/" class="btn">Use the Data Explorer &raquo;</a></p>
         <p class="getit-btn"><a href="library.html" class="btn">Use the Library &raquo;</a></p>
+        <p>Recline.js is freely redistributable under the terms of the MIT license.</p>
       </div>
       <div class="span4">
         <ul>
@@ -56,7 +90,7 @@
       </div>
       <div class="span4">
         <h5>Contacts</h5>
-        <ul>
+        <ul style="list-style-type: none; margin-left: 0;">
           <li><a href="http://twitter.com/maxogden">@maxogden</a></li>
           <li><a href="http://twitter.com/rufuspollock">@rufuspollock</a></li>
         </ul>
diff --git a/css/site/site.css b/css/site/site.css
index e44ce6dc..1d4aa426 100644
--- a/css/site/site.css
+++ b/css/site/site.css
@@ -131,6 +131,12 @@ a.dotted:hover {
    Layout
 --------------------------------------------------- */
 
+.navbar .logo-icon img {
+  margin-top: 6px;
+  margin-right: 8px;
+  height: 34px;
+}
+
 .navbar .brand {
 	font-family:'Open Sans', Helvetica, Arial, sans-serif;
 	font-style:italic;
@@ -144,6 +150,10 @@ a.dotted:hover {
   padding: 15px 10px;
 }
 
+.navbar .divider-vertical {
+  height: 50px;
+}
+
 .navbar-inner {
 	height:50px;
 	background: #303030; /* Old browsers */