diff options
| -rw-r--r-- | pelican-bootstrap3/templates/base.html | 2 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/pagination.html | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index 070dad2..d71a5c5 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -100,7 +100,7 @@ {% endif %} {% if category and CATEGORY_FEED_ATOM %} - <link href="{{ SITEURL }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" + <link href="{{ SITEURL }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ category }} ATOM Feed"/> {% endif %} diff --git a/pelican-bootstrap3/templates/includes/pagination.html b/pelican-bootstrap3/templates/includes/pagination.html index 9ae4285..2627bb1 100644 --- a/pelican-bootstrap3/templates/includes/pagination.html +++ b/pelican-bootstrap3/templates/includes/pagination.html @@ -23,9 +23,10 @@ <li class="prev disabled"><a href="#">«</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_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li> - {% endfor %} + href="{{ SITEURL }}/{{ page.url }}">{{ num }}</a></li> + {% endfor %} {% if articles_page.has_next() %} <li class="next"><a href="{{ SITEURL }}/{{ articles_next_page.url }}">»</a></li> @@ -34,4 +35,4 @@ {% endif %} </ul> {% endif %} -{% endif %}
\ No newline at end of file +{% endif %} |