X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/617e60be3c7d2e0f17639f3487a721d4efdc02c0..5d21f5d218e4214ca88ab5e89cd1e2ae30e6b0a8:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 694ab71..4d5ff09 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -13,6 +13,7 @@
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">
         {% if not question.nis.closed %}
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
@@ -111,24 +112,17 @@
                 <div class="tabBar">
                     <a name="sort-top"></a>
                     <div class="headQuestions">
-                    {% blocktrans count answers|length as counter %}
+                    {% blocktrans count answers.paginator.count as counter %}
                     One Answer:
                     {% plural %}
                     {{counter}} Answers:
                     {% endblocktrans %}
                     </div>
-                    <div class="tabsA">
-                         <a id="oldest" href="{{ question.get_absolute_url }}?sort=oldest#sort-top"
-                            title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
-                        <a id="latest" href="{{ question.get_absolute_url }}?sort=latest#sort-top"
-                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
-                        <a id="votes" href="{{ question.get_absolute_url }}?sort=votes#sort-top" 
-                            title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
-                    </div>
+                    {{ answers.paginator.sort_tabs }}
                 </div>
-                {% cnprog_paginator context %}
+                {{ answers.paginator.page_numbers }}
   
-                {% for answer in answers %}
+                {% for answer in answers.paginator.page %}
                     <a name="{{ answer.id }}"></a>
                     <div id="answer-container-{{ answer.id }}" class="answer {% if answer.nis.accepted %}accepted-answer{% endif %} {% ifequal answer.author_id question.author_id %} answered-by-owner{% endifequal %} {% if answer.nis.deleted %}deleted{% endif %}">
                         <table style="width:100%;">
@@ -159,7 +153,7 @@
                     </div>
                 {% endfor %}
                 <div class="paginator-container-left">
-                    {% cnprog_paginator context %}
+                    {{ answers.paginator.page_numbers }}
                 </div>
             {% endif %}
         <form id="fmanswer" action="{% url answer question.id %}" method="post">
@@ -178,6 +172,7 @@
                     </div>
                     {% endspaceless %}
                 </div>
+                {% comment %}
                 {% if not request.user.is_authenticated %}
                     <div class="message">{% trans "You can answer anonymously and then login." %}</div>
                 {% else %}
@@ -193,6 +188,7 @@
                         {% endif %}
                     </p>
                 {% endif %}
+                {% endcomment %}
 
                 <div id="description" class="" >
                     <div id="wmd-button-bar" class="wmd-panel"></div>