diff options
| -rw-r--r-- | bootstrap2/templates/sidebar.html | 4 | ||||
| m--------- | genus | 0 | ||||
| m--------- | ops | 0 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/footer.html | 6 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/pagination.html | 2 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/sidebar.html | 9 |
6 files changed, 13 insertions, 8 deletions
diff --git a/bootstrap2/templates/sidebar.html b/bootstrap2/templates/sidebar.html index 84b709d..745c05e 100644 --- a/bootstrap2/templates/sidebar.html +++ b/bootstrap2/templates/sidebar.html @@ -7,7 +7,9 @@ {% 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_ALL_ATOM %} +<li><a href="{{ SITEURL }}/{{ FEED_ALL_ATOM }}" rel="alternate"><i class="icon-bookmark icon-large"></i>atom feed</a></li> +{% endif %} {% if FEED_RSS %} <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate"><i class="icon-bookmark icon-large"></i>rss feed</a></li> {% endif %} diff --git a/genus b/genus -Subproject 5defe62ab86976b640b9d3042cb4c2896b32a75 +Subproject 0549c1998b5b812e518f61bb188cd6956a6127d diff --git a/ops b/ops new file mode 160000 +Subproject b11685deba7327b0bfc156b3d84d5fd775ea495 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> - |