X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f8bdcf43ec75e04c30cb26e6c35e1a9f3cf262be..e907efa7d02378ca6e4cbbcfacd25054faacf3bc:/forum/skins/default/templates/questions.html?ds=sidebyside

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index ddf4f69..f470ba3 100644
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -3,26 +3,47 @@
 {% load question_list_tags %}
 {% load i18n %}
 {% load extra_tags %}
+{% load general_sidebar_tags %}
+
+{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
+
+{% block metadescription %}{% spaceless %}
+    {% if tag %}
+        {% blocktrans with settings.APP_TITLE as app_title %}Questions and answers about {{ tag }} on {{ app_title }}{% endblocktrans %}
+    {% endif %}
+{% endspaceless %}{% endblock %}
+
+{% block meta %}
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}" />
+{% endblock %}
 
-{% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}
 {% block content %}
+
 <div class="tabBar">
-    {% question_list_title %}
-    {% question_sort_tabs sort_context %}
+    {% include "question_list/title.html" %}
+    <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>
+    {{ questions.paginator.sort_tabs }}
 </div>
-<div id="listA">{% for question in questions %}
-    {% question_list_item question %}
+<div id="listA">{% for question in questions.paginator.page %}
+    {% if show_summary %}
+      {% question_list_item question question_summary=yes %}
+    {% else %}
+      {% question_list_item question %}
+    {% endif %}
 {% endfor %}</div>
 {% endblock %}
 
 {% block tail %}
-    <div class="pager">{% cnprog_paginator pagination_context %}</div>
-    <div class="pagesize">{% cnprog_pagesize pagination_context %}</div>
+    <div class="pager">{{ questions.paginator.page_numbers }}</div>
+    <div class="pagesize">{{ questions.paginator.page_sizes }}</div>
 {% endblock %}
 
 {% block sidebar %}
-    {% question_list_count %}
+    {% include "question_list/count.html" %}
+    {% sidebar_upper %}
     {% tag_selector %}
-    {% question_list_related_tags questions %}
+    {% sidebar_lower %}
+    {% question_list_related_tags questions.paginator.page %}
+
 {% endblock %}
 <!-- end questions.html -->