Merge pull request getpelican#267 from lgiordani/fix_category_feeds

pelican-bootstrap3: Fix category feeds and pagination
TronPaul · Oct 31, 2014 · 6d4054e · 6d4054e
2 parents 4f930ce + a6bcb10
commit 6d4054e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -23,9 +23,10 @@
                 <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_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 }}">&raquo;</a></li>
@@ -34,4 +35,4 @@
             {% endif %}
         </ul>
     {% endif %}
-{% endif %}
+{% endif %}