1 files changed, 38 insertions, 31 deletions
diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html
index 346837a..ec9e5ea 100644
--- a/tuxlite_tbs/templates/base.html
+++ b/tuxlite_tbs/templates/base.html
@@ -13,21 +13,27 @@
 
     <!-- Le styles -->
     <link href="{{ SITEURL }}/theme/bootstrap.min.css" rel="stylesheet">
-    <link href="{{ SITEURL }}/theme/bootstrap-responsive.min.css" rel="stylesheet">
+    <link href="{{ SITEURL }}/theme/bootstrap.min.responsive.css" rel="stylesheet">
     <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet">
     <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet">
 
 </head>
 
 <body>
-    {% include "github.html" %} 
 
-<div class="navbar navbar-static">
+<div class="navbar">
     <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="{{ SITEURL }}">{{ SITENAME }}</a>
 
+        <div class="nav-collapse">
         <ul class="nav">
         {% for title, link in MENUITEMS %}
             <li><a href="{{ link }}">{{ title }}</a></li>
@@ -35,14 +41,11 @@
             
         {% if DISPLAY_PAGES_ON_MENU %}
         {% for page in PAGES %}
-        {% if page.category|lower != "documentation" %}
-            <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
-        {% endif %}
+            <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
         {% endfor %}
         {% endif %}
         </ul>
-         
-        <p class="pull-right"><a href="{{ SITEURL }}/archives.html">Archives</a> | <a href="{{ SITEURL }}/tags.html">Tags</a></p>
+        </div>
         
     </div>
     </div>
@@ -58,23 +61,40 @@
         
         <div class="span3">
 
+            <div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
+            <ul class="nav nav-list">
+                <li class="nav-header"> 
+                Site
+                </li>
+            
+                <li><a href="{{ SITEURL }}/archives.html">Archives</a>
+                <li><a href="{{ SITEURL }}/tags.html">Tags</a>
+                <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Atom feed</a></li>
+                {% if FEED_RSS %}
+                <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>
+                {% endif %}
+            </ul>
+            </div>
+
+
             {% if categories %}
             <div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
-            <ul class="nav list">
+            <ul class="nav nav-list">
                 <li class="nav-header"> 
                 Categories
                 </li>
                 
                 {% for cat, null in categories %}
-                <li><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                <li><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}                   
             </ul>
             </div>
             {% endif %}
 
+
             {% if LINKS %}
             <div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
-            <ul class="nav list">
+            <ul class="nav nav-list">
                 <li class="nav-header"> 
                 Links
                 </li>
@@ -86,19 +106,15 @@
             </div>
             {% endif %}
 
+
             {% if SOCIAL %}
             <div class="social">
             <div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
-            <ul class="nav list">
+            <ul class="nav nav-list">
                 <li class="nav-header"> 
                 Social
                 </li>
-            
-                <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li>
-                {% if FEED_RSS %}
-                <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li>
-                {% endif %}
- 
+           
                 {% for name, link in SOCIAL %}
                 <li><a href="{{ link }}">{{ name }}</a></li>
                 {% endfor %}
@@ -107,28 +123,19 @@
             </div>
             {% endif %}
 
-            {# <h3>Documentation</h3> #}
-            {# <ul> #}
-            {# {% for page in PAGES %} #}
-            {# {% if page.category|lower == "documentation" %} #}
-            {#     <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li> #}
-            {# {% endif %} #}
-            {# {% endfor %} #}
-            {# </ul> #}
-
         </div> {# End span3 #} 
     </div> {# End row #}
     </div> {# End content #}
 
 <footer>
 <br />
-<p>{{ SITENAME }} &copy; {{ AUTHOR }} 2012</p>
+<p><a href="{{ SITEURL }}">{{ SITENAME }}</a> &copy; {{ AUTHOR }} 2012</p>
 </footer>
 
 </div> <!-- /container -->
-
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+<script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-collapse.js"></script>
 {% include "analytics.html" %}
-{% include "disqus.html" %}
-
+{% include "github.html" %} 
 </body>
 </html>