From 524cfb091d7d3993f81091f0cba9e194951a17a6 Mon Sep 17 00:00:00 2001
From: Daan Debie <d.debie@thenewmotion.com>
Date: Sat, 21 Feb 2015 23:16:27 +0100
Subject: Updated pelican-bootstrap3 to latest version

---
 pelican-bootstrap3/templates/includes/aboutme.html |  16 +-
 pelican-bootstrap3/templates/includes/addthis.html |   4 -
 .../templates/includes/article_info.html           |  13 +-
 pelican-bootstrap3/templates/includes/banner.html  |  16 ++
 .../templates/includes/coderwall-js.html           |  15 --
 .../templates/includes/coderwall.html              |   7 -
 pelican-bootstrap3/templates/includes/footer.html  |   2 +-
 .../templates/includes/liquid_tags_nb_header.html  |   2 +-
 .../templates/includes/pagination.html             |   7 +-
 pelican-bootstrap3/templates/includes/series.html  |  22 ---
 pelican-bootstrap3/templates/includes/shariff.html |  25 ++++
 pelican-bootstrap3/templates/includes/sidebar.html | 161 +++++++++------------
 12 files changed, 128 insertions(+), 162 deletions(-)
 create mode 100644 pelican-bootstrap3/templates/includes/banner.html
 delete mode 100644 pelican-bootstrap3/templates/includes/coderwall-js.html
 delete mode 100644 pelican-bootstrap3/templates/includes/coderwall.html
 delete mode 100644 pelican-bootstrap3/templates/includes/series.html
 create mode 100644 pelican-bootstrap3/templates/includes/shariff.html

(limited to 'pelican-bootstrap3/templates/includes')

diff --git a/pelican-bootstrap3/templates/includes/aboutme.html b/pelican-bootstrap3/templates/includes/aboutme.html
index ba56070..f38f0bc 100644
--- a/pelican-bootstrap3/templates/includes/aboutme.html
+++ b/pelican-bootstrap3/templates/includes/aboutme.html
@@ -1,9 +1,11 @@
-{% if AVATAR %}
+<div id="aboutme">
+    {% if AVATAR %}
+        <p>
+            <img width="100%" class="img-thumbnail" src="{{ AVATAR }}"/>
+        </p>
+    {% endif %}
     <p>
-        <img width="100%" class="img-thumbnail" src="{{ AVATAR }}"/>
+        <strong>About {{ AUTHOR }}</strong><br/>
+        {{ ABOUT_ME }}
     </p>
-{% endif %}
-<p>
-    <strong>About {{ AUTHOR }}</strong><br/>
-    {{ ABOUT_ME }}
-</p>
+</div>
\ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/addthis.html b/pelican-bootstrap3/templates/includes/addthis.html
index 12e2e8a..52bad77 100644
--- a/pelican-bootstrap3/templates/includes/addthis.html
+++ b/pelican-bootstrap3/templates/includes/addthis.html
@@ -12,9 +12,5 @@
             <a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
         {% endif %}
     </div>
-    {% if ADDTHIS_DATA_TRACK_ADDRESSBAR|default(true) %}
-        <script type="text/javascript">var addthis_config = {"data_track_addressbar": true};</script>
-    {% endif %}
-    <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADDTHIS_PROFILE }}"></script>
     <!-- AddThis Button END -->
 {% endif %}
\ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/article_info.html b/pelican-bootstrap3/templates/includes/article_info.html
index 787c360..ee107c9 100644
--- a/pelican-bootstrap3/templates/includes/article_info.html
+++ b/pelican-bootstrap3/templates/includes/article_info.html
@@ -3,15 +3,14 @@
     <span class="published">
         <i class="fa fa-calendar"></i><time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }}</time>
     </span>
-
-    {% if SHOW_SERIES %}
-        {% if article.series %}
-            <span class="label label-default">Series</span>
-            Part {{ article.series.index}} of {{ article.series.name }}
+    {% if SHOW_DATE_MODIFIED %}
+        {% if article.modified %}
+            <span class="label label-default">Modified</span>
+            <span class="modified">
+                <i class="fa fa-calendar"></i><time datetime="{{ article.modified.isoformat() }}"> {{ article.locale_modified }}</time>
+            </span>
         {% endif %}
     {% endif %}
-
-
     {% if SHOW_ARTICLE_AUTHOR %}
         {% if article.author %}
             <span class="label label-default">By</span>
diff --git a/pelican-bootstrap3/templates/includes/banner.html b/pelican-bootstrap3/templates/includes/banner.html
new file mode 100644
index 0000000..637eb38
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/banner.html
@@ -0,0 +1,16 @@
+<style>
+	#banner{
+	    background-image:url("{{ SITEURL}}/{{ BANNER }}");
+	}
+</style>
+
+<div id="banner">
+	<div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}">
+		<div class="copy">
+			<h1>{{ SITENAME }}</h1>
+			{% if BANNER_SUBTITLE %}
+				<p class="intro">{{ BANNER_SUBTITLE }}</p>
+			{% endif %}
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/coderwall-js.html b/pelican-bootstrap3/templates/includes/coderwall-js.html
deleted file mode 100644
index 1e3a9d5..0000000
--- a/pelican-bootstrap3/templates/includes/coderwall-js.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% if CODERWALL_USER %}
-	<script type="text/javascript">
-	$(document).ready(function(){
-		$.getJSON("http://coderwall.com/{{ CODERWALL_USER }}.json?callback=?", function(data){
-			for(var i = 0; i < data.data.badges.length ; i++){
-				var badge = data.data.badges[i];
-				var badge_tag = $("<img />");
-				badge_tag.attr("src",badge.badge);
-				badge_tag.css("width","50%");
-				$("#coderwall_badges").append(badge_tag);
-			}
-		});
-	});
-	</script>
-{% endif %}
diff --git a/pelican-bootstrap3/templates/includes/coderwall.html b/pelican-bootstrap3/templates/includes/coderwall.html
deleted file mode 100644
index 2917577..0000000
--- a/pelican-bootstrap3/templates/includes/coderwall.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if CODERWALL_USER %}
-	<li class="list-group-item">
-		<h4><i class="fa fa-github-alt fa-lg"></i><span class="icon-label">Coderwall Badges</span></h4>
-		<div id="coderwall_badges"></div>
-		<a href="http://coderwall.com/{{ CODERWALL_USER }}">@{{ CODERWALL_USER }}</a> on coderwall
-	</li>
-{% endif %}
diff --git a/pelican-bootstrap3/templates/includes/footer.html b/pelican-bootstrap3/templates/includes/footer.html
index 7b430cd..76e8ed4 100644
--- a/pelican-bootstrap3/templates/includes/footer.html
+++ b/pelican-bootstrap3/templates/includes/footer.html
@@ -1,5 +1,5 @@
 <footer>
-   <div class="container">
+   <div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}">
       <hr>
       <div class="row">
          {% if articles %}
diff --git a/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html b/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html
index 3d70df5..c9e9c59 100644
--- a/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html
+++ b/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html
@@ -135,7 +135,7 @@ div.text_cell_render {
 img.anim_icon{padding:0; border:0; vertical-align:middle; -webkit-box-shadow:none; -box-shadow:none}
 </style>
 
-<script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript"></script>
+<script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript"></script>
 <script type="text/javascript">
 init_mathjax = function() {
     if (window.MathJax) {
diff --git a/pelican-bootstrap3/templates/includes/pagination.html b/pelican-bootstrap3/templates/includes/pagination.html
index 2627bb1..9ae4285 100644
--- a/pelican-bootstrap3/templates/includes/pagination.html
+++ b/pelican-bootstrap3/templates/includes/pagination.html
@@ -23,10 +23,9 @@
                 <li class="prev disabled"><a href="#">&laquo;</a></li>
             {% endif %}
             {% for num in range( 1, 1 + articles_paginator.num_pages ) %}
-                    {% set page = articles_paginator.page(num) %}
                     <li class="{{ 'active' if num == articles_page.number else '' }}"><a
-                            href="{{ SITEURL }}/{{ page.url }}">{{ num }}</a></li>
-            {% endfor %}
+                            href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
+                {% endfor %}
             {% if articles_page.has_next() %}
                 <li class="next"><a
                         href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a></li>
@@ -35,4 +34,4 @@
             {% endif %}
         </ul>
     {% endif %}
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/series.html b/pelican-bootstrap3/templates/includes/series.html
deleted file mode 100644
index 24729a2..0000000
--- a/pelican-bootstrap3/templates/includes/series.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% if article.series %}
-<section class="well" id="related-posts">
-	{% set text = SERIES_TEXT|default('Part %(index)s of the %(name)s series') %}
-    <h4>{{ text|format(index=article.series.index, name=article.series.name) }}</h4>
-    {% if article.series.all_previous %}
-	    <h5>Previous articles</h5>
-	    <ul>
-	    {% for article in article.series.all_previous %}
-	        <li><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></li>
-	    {% endfor %}
-	    </ul>
-    {% endif %}
-    {% if article.series.all_next %}
-	    <h5>Next articles</h5>
-	    <ul>
-	    {% for article in article.series.all_next %}
-	        <li><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></li>
-	    {% endfor %}
-	    </ul>
-    {% endif %}
-</section>
-{% endif %}
diff --git a/pelican-bootstrap3/templates/includes/shariff.html b/pelican-bootstrap3/templates/includes/shariff.html
new file mode 100644
index 0000000..d00e5f7
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/shariff.html
@@ -0,0 +1,25 @@
+{% if SHARIFF|default(false) %}
+    <hr />
+    <!-- Shariff Button BEGIN -->
+    <div class="shariff"
+        {% if SHARIFF_BACKEND_URL %}
+        data-backend-url="{{ SHARIFF_BACKEND_URL }}"
+        {% endif %}
+        {% if SHARIFF_LANG %}
+        data-lang="{{ SHARIFF_LANG }}"
+        {% endif %}
+        {% if SHARIFF_ORIENTATION|default('vertical') %}
+        data-orientation="{{ SHARIFF_ORIENTATION }}"
+        {% endif %}
+        {% if SHARIFF_SERVICES %}
+        data-services = "{{ SHARIFF_SERVICES }}"
+        {% endif %}
+        {% if SHARIFF_THEME %}
+        data-theme="{{ SHARIFF_THEME }}"
+        {% endif %}
+        {% if SHARIFF_TWITTER_VIA|default(false) %}
+        data-twitter-via="{{ TWITTER_USERNAME }}"
+        {% endif %}
+        data-url="{{ SITEURL }}/{{ article.url }}"></div>
+    <!-- Shariff Button END -->
+{% endif %}
\ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/sidebar.html b/pelican-bootstrap3/templates/includes/sidebar.html
index 35811f6..db8d0a3 100644
--- a/pelican-bootstrap3/templates/includes/sidebar.html
+++ b/pelican-bootstrap3/templates/includes/sidebar.html
@@ -2,103 +2,76 @@
     {% set DISPLAY_TAGS_ON_SIDEBAR = True %}
 {% endif %}
 
-<aside>
-    <section>
-        <ul class="list-group list-group-flush">
-            {% if SOCIAL %}
-                <li class="list-group-item"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Social</span></h4>
-                  <ul class="list-group" id="social">
-                    {% for name, link in SOCIAL %}
-                        {% set name_sanitized = name|lower|replace('+','-plus')|replace(' ','-') %}
-                        {% if name_sanitized in ['flickr', 'spotify', 'stack-overflow'] %}
-                            {% set iconattributes = '"fa fa-' ~ name_sanitized ~ ' fa-lg"' %}
-                        {% else %}
-                            {% set iconattributes = '"fa fa-' ~ name_sanitized ~ '-square fa-lg"' %}
-                        {% endif %}
-                    <li class="list-group-item"><a href="{{ link }}"><i class={{ iconattributes }}></i> {{ name }}</a></li>
-                    {% endfor %}
-                  </ul>
-                </li>
-            {% endif %}
-
-            {% if DISPLAY_RECENT_POSTS_ON_SIDEBAR %}
-                {% if RECENT_POST_COUNT is not defined %}
-                    {% set RECENT_POST_COUNT = 5 %}
-                {% endif %}
-                <li class="list-group-item"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Recent Posts</span></h4>
-                    <ul class="list-group" id="recentposts">
-                    {% for article in articles[:RECENT_POST_COUNT] %}
-                        <li class="list-group-item">
-                            <a href="{{ SITEURL }}/{{ article.url }}">
-                                {{ article.title }}
-                            </a>
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </li>
-            {% endif %}
+<section class="well well-sm">
+    <ul class="list-group list-group-flush">
+        {% if SOCIAL %}
+            <li class="list-group-item"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Social</span></h4>
+              <ul class="list-group" id="social">
+                {% for name, link in SOCIAL %}
+                    {% set name_sanitized = name|lower|replace('+','-plus')|replace(' ','-') %}
+                    {% if name_sanitized in ['flickr', 'spotify', 'stack-overflow', 'weibo'] %}
+                        {% set iconattributes = '"fa fa-' ~ name_sanitized ~ ' fa-lg"' %}
+                    {% else %}
+                        {% set iconattributes = '"fa fa-' ~ name_sanitized ~ '-square fa-lg"' %}
+                    {% endif %}
+                <li class="list-group-item"><a href="{{ link }}"><i class={{ iconattributes }}></i> {{ name }}</a></li>
+                {% endfor %}
+              </ul>
+            </li>
+        {% endif %}
 
-            {% if DISPLAY_CATEGORIES_ON_SIDEBAR %}
-                <li class="list-group-item"><a href="{{ SITEURL }}/{{ CATEGORIES_URL }}"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Categories</span></h4></a>
-                    <ul class="list-group" id="categories">
-                    {% for cat, null in categories %}
-                        <li class="list-group-item">
-                            <a href="{{ SITEURL }}/{{ cat.url }}">
-                                <i class="fa fa-folder-open fa-lg"></i> {{ cat }}
-                            </a>
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </li>
+        {% if DISPLAY_RECENT_POSTS_ON_SIDEBAR %}
+            {% if RECENT_POST_COUNT is not defined %}
+                {% set RECENT_POST_COUNT = 5 %}
             {% endif %}
+            <li class="list-group-item"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Recent Posts</span></h4>
+                <ul class="list-group" id="recentposts">
+                {% for article in articles[:RECENT_POST_COUNT] %}
+                    <li class="list-group-item">
+                        <a href="{{ SITEURL }}/{{ article.url }}">
+                            {{ article.title }}
+                        </a>
+                    </li>
+                {% endfor %}
+                </ul>
+            </li>
+        {% endif %}
 
-            {% if DISPLAY_TAGS_ON_SIDEBAR %}
-                {% if DISPLAY_TAGS_INLINE %}
-                    {% set tags = tag_cloud | sort(attribute='0') %}
-                {% else %}
-                    {% set tags = tag_cloud | sort(attribute='1') %}
-                {% endif %}
-                <li class="list-group-item"><a href="{{ SITEURL }}/{{ TAGS_URL }}"><h4><i class="fa fa-tags fa-lg"></i><span class="icon-label">Tags</span></h4></a>
-                    <ul class="list-group {% if DISPLAY_TAGS_INLINE %}list-inline tagcloud{% endif %}" id="tags">
-                    {% for tag in tags %}
-                        <li class="list-group-item tag-{{ tag.1 }}">
-                            <a href="{{ SITEURL }}/{{ tag.0.url }}">
-                                {{ tag.0 }}
-                            </a>
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </li>    
-            {% endif %}
+        {% if DISPLAY_CATEGORIES_ON_SIDEBAR %}
+            <li class="list-group-item"><a href="{{ SITEURL }}/{{ CATEGORIES_URL }}"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Categories</span></h4></a>
+                <ul class="list-group" id="categories">
+                {% for cat, null in categories %}
+                    <li class="list-group-item">
+                        <a href="{{ SITEURL }}/{{ cat.url }}">
+                            <i class="fa fa-folder-open fa-lg"></i> {{ cat }}
+                        </a>
+                    </li>
+                {% endfor %}
+                </ul>
+            </li>
+        {% endif %}
 
-            {% if DISPLAY_SERIES_ON_SIDEBAR %}
-                {% if article %}
-                    {% if article.series %}
-                        <li class="list-group-item"><h4><i class="fa fa-tags fa-list-ul"></i><span class="icon-label">Series</span></h4>
-                            <ul class="list-group">
-                                <li class="list-group-item">
-                                {% if article.series.previous %}
-                                    <h5></i> Previous article</h5>
-                                    <a href="{{ SITEURL }}/{{ article.series.previous.url }}">{{ article.series.previous.title }}</a>
-                                {% endif %}
-                                </li>
-                                <li class="list-group-item">
-                                {% if article.series.next %}
-                                    <h5>Next article</h5>
-                                    <a href="{{ SITEURL }}/{{ article.series.next.url }}">{{ article.series.next.title }}</a>
-                                {% endif %}
-                                </li>
-                            </ul>
-                        </li>
-                    {% endif%}
-                {% endif %}
+        {% if DISPLAY_TAGS_ON_SIDEBAR %}
+            {% if DISPLAY_TAGS_INLINE %}
+                {% set tags = tag_cloud | sort(attribute='0') %}
+            {% else %}
+                {% set tags = tag_cloud | sort(attribute='1') %}
             {% endif %}
+            <li class="list-group-item"><a href="{{ SITEURL }}/{{ TAGS_URL }}"><h4><i class="fa fa-tags fa-lg"></i><span class="icon-label">Tags</span></h4></a>
+                <ul class="list-group {% if DISPLAY_TAGS_INLINE %}list-inline tagcloud{% endif %}" id="tags">
+                {% for tag in tags %}
+                    <li class="list-group-item tag-{{ tag.1 }}">
+                        <a href="{{ SITEURL }}/{{ tag.0.url }}">
+                            {{ tag.0 }}
+                        </a>
+                    </li>
+                {% endfor %}
+                </ul>
+            </li>
+        {% endif %}
+        {% include 'includes/github.html' %}
+        {% include 'includes/twitter_timeline.html' %}
+        {% include 'includes/links.html' %}
+    </ul>
+</section>
 
-            {% include 'includes/github.html' %}
-            {% include 'includes/twitter_timeline.html' %}
-            {% include 'includes/links.html' %}
-
-        </ul>
-    </section>
-
-</aside>
-- 
cgit