Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 43 insertions, 0 deletions

diff --git a/bootstrap2-dark/templates/sidebar.html b/bootstrap2-dark/templates/sidebar.html
new file mode 100644
index 0000000..84b709d
--- /dev/null
+++ b/bootstrap2-dark/templates/sidebar.html
@@ -0,0 +1,43 @@
+<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><a href="{{ link }}"><i class="icon-external-link"></i>{{ 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 }}/{{ cat.url }}">
+    <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.0.url }}">
+        <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>