Merge branch 'master' into archive-sidebar

3 files changed, 28 insertions, 0 deletions

diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html
index 195934b..9a69baf 100644
--- a/pelican-bootstrap3/templates/base.html
+++ b/pelican-bootstrap3/templates/base.html
@@ -53,6 +53,11 @@
     {# Twitter Cards tags #}
     {% include 'includes/twitter_cards.html' %}
 
+    {# Flattr ID for the Flattr browser plug-in #}
+    {% if FLATTR_ID %}
+        <meta name="flattr:id" content="m1qj28">
+    {% endif %}
+
     <!-- Bootstrap -->
     {% if BOOTSTRAP_THEME %}
         <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap.{{ BOOTSTRAP_THEME }}.min.css" type="text/css"/>
diff --git a/pelican-bootstrap3/templates/includes/sidebar.html b/pelican-bootstrap3/templates/includes/sidebar.html
index b9cd101..71bab3a 100644
--- a/pelican-bootstrap3/templates/includes/sidebar.html
+++ b/pelican-bootstrap3/templates/includes/sidebar.html
@@ -10,6 +10,7 @@
     {% include 'includes/sidebar/github.html' %}
     {% include 'includes/sidebar/twitter_timeline.html' %}
     {% include 'includes/sidebar/links.html' %}
+    {% include 'includes/sidebar/authors.html' %}
     {% include 'includes/sidebar/images.html' %}
     {% include 'includes/sidebar/archive.html' %}
     {% include 'includes/sidebar/optional_bottom.html' ignore missing %}
diff --git a/pelican-bootstrap3/templates/includes/sidebar/authors.html b/pelican-bootstrap3/templates/includes/sidebar/authors.html
new file mode 100644
index 0000000..114c688
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/sidebar/authors.html
@@ -0,0 +1,22 @@
+{% if DISPLAY_AUTHORS_ON_SIDEBAR %}
+  {% from 'includes/sidebar/macros.jinja' import title %}
+
+<!-- Sidebar/Authors -->
+<li class="list-group-item">
+  <h4>{{ title(_('Authors'), DISABLE_SIDEBAR_TITLE_ICONS) }}</h4>
+  <ul class="list-group" id="authors">
+    {% for author, articles in authors|sort %}
+    <li class="list-group-item">
+      <a href="{{ SITEURL }}/{{ author.url }}">
+        {%- if not DISABLE_SIDEBAR_TITLE_ICONS -%}
+        <i class="fa fa-user fa-lg"></i>
+        {%- endif -%}
+        {{- author -}}
+      </a>
+      ({{ articles|count }})
+    </li>
+    {% endfor %}
+  </ul>
+</li>
+<!-- End Sidebar/Authors -->
+{% endif %}