aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap2/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap2/templates/base.html')
-rw-r--r--bootstrap2/templates/base.html57
1 files changed, 6 insertions, 51 deletions
diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html
index 22ce313..3e42e65 100644
--- a/bootstrap2/templates/base.html
+++ b/bootstrap2/templates/base.html
@@ -91,9 +91,6 @@
<ul class="nav pull-right">
<li><a href="{{ SITEURL }}/archives.html"><i class="icon-th-list"></i>Archives</a></li>
</ul>
-
-
-
</ul>
<!--<p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>-->
@@ -104,56 +101,14 @@
<div class="container-fluid">
<div class="row">
- <div class="span3 well sidebar-nav" id="sidebar">
- <ul class="nav nav-list">
- {% if LINKS %}
- <li class="nav-header"><h4><i class="icon-external-link"></i>blogroll</h4></li>
- {% for name, link in LINKS %}
- <li><i class="icon-external-link"></i><a href="{{ link }}">{{ name }}</a></li>
- {% endfor %}
- {% endif %}
- {% if SOCIAL %}
- <li class="nav-header"><h4><i class="icon-home icon-large"></i> social</h4></li>
- <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate"><i class="icon-bookmark icon-large"></i>atom feed</a></li>
- {% if FEED_RSS %}
- <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate"><i class="icon-bookmark icon-large"></i>rss feed</a></li>
- {% endif %}
- {% for name, link in SOCIAL %}
- <li><a href="{{ link }}"><i class="icon-{{ name }}-sign icon-large"></i>{{ name }}</a></li>
- {% endfor %}
- {% endif %}
-
- <li class="nav-header"><h4><i class="icon-folder-close icon-large"></i>Categories</h4></li>
- {% for cat, null in categories %}
- <li>
- <a href="{{ SITEURL }}/category/{{ cat }}.html">
- <i class="icon-folder-open icon-large"></i>{{ cat }}
- </a>
- </li>
- {% endfor %}
-
- <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li>
- {% for tag in tag_cloud %}
- <li class="tag-{{ tag.1 }}">
- <a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">
- <i class="icon-tag icon-large"></i>{{ tag.0 }}
- </a>
- </li>
- {% endfor %}
-
- {% include 'twitter_profile.html' %}
- {% include 'search_sidebar.html' %}
-
- {% if SIDEBAR_CUSTOM %}
- {{ SIDEBAR_CUSTOM }}
- {% endif %}
- </ul>
- </div><!--/.well -->
-
<div class="span9" id="content">
- {% block content %}
- {% endblock %}
+ {% block content %}
+ {% endblock %}
</div><!--/span-->
+
+ <div class="span3 well sidebar-nav" id="sidebar">
+ {% include 'sidebar.html' %}
+ </div><!--/.well -->
</div><!--/row-->