Prevents questions on which the slug comes out empty to enter a redirect loop.

[osqa.git] / forum / skins / default / templates / questions.html

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index 9c3523ac9514eba6360e5cecb76e6c0190249b49..34c81ba42d4854ba074d55a946a1f6eb8e8b0597 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -8,23 +8,24 @@
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 \r
 {% block forejs %}\r
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 \r
 {% block forejs %}\r

-    <link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/rss">\r
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}">\r

 {% endblock %}\r
 \r
 {% block content %}\r
 {% endblock %}\r
 \r
 {% block content %}\r

+\r

 <div class="tabBar">\r
     {% question_list_title %}\r
     <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>\r
 <div class="tabBar">\r
     {% question_list_title %}\r
     <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>\r

-    {% question_sort_tabs sort_context %}\r
+    {{ questions.paginator.sort_tabs }}\r

 </div>\r
 </div>\r

-<div id="listA">{% for question in questions %}\r
+<div id="listA">{% for question in questions.paginator.page %}\r

     {% question_list_item question %}\r
 {% endfor %}</div>\r
 {% endblock %}\r
 \r
 {% block tail %}\r
     {% question_list_item question %}\r
 {% endfor %}</div>\r
 {% endblock %}\r
 \r
 {% block tail %}\r

-    <div class="pager">{% cnprog_paginator pagination_context %}</div>\r
-    <div class="pagesize">{% cnprog_pagesize pagination_context %}</div>\r
+    <div class="pager">{{ questions.paginator.page_numbers }}</div>\r
+    <div class="pagesize">{{ questions.paginator.page_sizes }}</div>\r

 {% endblock %}\r
 \r
 {% block sidebar %}\r
 {% endblock %}\r
 \r
 {% block sidebar %}\r


@@ -32,7 +33,7 @@
     {% sidebar_upper %}\r
     {% tag_selector %}\r
     {% sidebar_lower %}\r
     {% sidebar_upper %}\r
     {% tag_selector %}\r
     {% sidebar_lower %}\r

-    {% question_list_related_tags questions %}\r
+    {% question_list_related_tags questions.paginator.page %}\r

 \r
 {% endblock %}\r
 <!-- end questions.html -->\r
 \r
 {% endblock %}\r
 <!-- end questions.html -->\r