3 files changed, 10 insertions, 7 deletions
diff --git a/pelican-bootstrap3/templates/includes/footer.html b/pelican-bootstrap3/templates/includes/footer.html
index ccd951b..b792835 100644
--- a/pelican-bootstrap3/templates/includes/footer.html
+++ b/pelican-bootstrap3/templates/includes/footer.html
@@ -3,7 +3,11 @@
       <hr>
       <div class="row">
          {% if articles %}
-            {% set copy_date = articles[0].date.strftime('%Y') %}
+           {% if articles[0].modified %}
+             {% set copy_date = articles[0].modified.strftime('%Y') %}
+           {% else %}
+             {% set copy_date = articles[0].date.strftime('%Y') %}
+           {% endif %}
          {% else %}
             {% set copy_date = '' %}
          {% endif %}
diff --git a/pelican-bootstrap3/templates/includes/pagination.html b/pelican-bootstrap3/templates/includes/pagination.html
index 9ae4285..e74cdba 100644
--- a/pelican-bootstrap3/templates/includes/pagination.html
+++ b/pelican-bootstrap3/templates/includes/pagination.html
@@ -24,7 +24,7 @@
             {% endif %}
             {% for num in range( 1, 1 + articles_paginator.num_pages ) %}
                     <li class="{{ 'active' if num == articles_page.number else '' }}"><a
-                            href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
+                            href="{{ SITEURL }}/{{ articles_paginator.page(num).url if num > 1 else articles_paginator.page(1).url }}">{{ num }}</a></li>
                 {% endfor %}
             {% if articles_page.has_next() %}
                 <li class="next"><a
diff --git a/pelican-bootstrap3/templates/includes/sidebar.html b/pelican-bootstrap3/templates/includes/sidebar.html
index 2698338..4d7e6bb 100644
--- a/pelican-bootstrap3/templates/includes/sidebar.html
+++ b/pelican-bootstrap3/templates/includes/sidebar.html
@@ -79,18 +79,18 @@
                 {% 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 %}
+                            <li class="list-group-item">
                                 <h5></i> Previous article</h5>
                                 <a href="{{ SITEURL }}/{{ article.series.previous.url }}">{{ article.series.previous.title }}</a>
-                            {% endif %}
                             </li>
-                            <li class="list-group-item">
+                            {% endif %}
                             {% if article.series.next %}
+                            <li class="list-group-item">
                                 <h5>Next article</h5>
                                 <a href="{{ SITEURL }}/{{ article.series.next.url }}">{{ article.series.next.title }}</a>
-                            {% endif %}
                             </li>
+                            {% endif %}
                         </ul>
                     </li>
                 {% endif%}
@@ -103,4 +103,3 @@
         {% include 'includes/sidebar-images.html' %}
     </ul>
 </section>
-