X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f241c71f15e002848cf9527c7141063c6c5e5bf8..48da83177329ce1b7d3dfcfc83600e067120c7e2:/forum/skins/default/templates/questions.html

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index 9eea455..1fec6af 100644
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -1,28 +1,49 @@
-{% extends "base.html" %}
-<!-- questions.html -->
-{% load question_list_tags %}
-{% load i18n %}
-{% load extra_tags %}
-
-{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
-{% block content %}
-<div class="tabBar">
-    {% question_list_title %}
-    {% question_sort_tabs sort_context %}
-</div>
-<div id="listA">{% for question in questions %}
-    {% question_list_item question %}
-{% endfor %}</div>
-{% endblock %}
-
-{% block tail %}
-    <div class="pager">{% cnprog_paginator pagination_context %}</div>
-    <div class="pagesize">{% cnprog_pagesize pagination_context %}</div>
-{% endblock %}
-
-{% block sidebar %}
-    {% question_list_count %}
-    {% tag_selector %}
-    {% question_list_related_tags questions %}
-{% endblock %}
-<!-- end questions.html -->
+{% extends "base.html" %}
+<!-- questions.html -->
+{% 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 content %}
+
+<div class="tabBar">
+    {% 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.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">{{ questions.paginator.page_numbers }}</div>
+    <div class="pagesize">{{ questions.paginator.page_sizes }}</div>
+{% endblock %}
+
+{% block sidebar %}
+    {% include "question_list/count.html" %}
+    {% sidebar_upper %}
+    {% tag_selector %}
+    {% sidebar_lower %}
+    {% question_list_related_tags questions.paginator.page %}
+
+{% endblock %}
+<!-- end questions.html -->