Jira OSQA-528, display the tag name in the meta description on the tag view, extendin...

[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 0431c9e0aa77d6ce22eef3fca9add2ceb508c3fb..6b9e0a394873104747cb36128f162134ad95dacc 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -7,32 +7,39 @@
 \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
+{% block metadescription %}{% spaceless %}\r
+    {% if tag %}\r
+        {% blocktrans with settings.APP_TITLE as app_title %}Questions and answers about {{ tag }} on {{ app_title }}{% endblocktrans %}\r
+    {% endif %}\r
+{% endspaceless %}{% endblock %}\r
+\r
+{% block meta %}\r
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}" />\r
 {% endblock %}\r
 \r
 {% block content %}\r
+\r
 <div class="tabBar">\r
-    {% question_list_title %}\r
-    <a style="float:left" href="/feeds/rss" title="{% trans "subscribe to question RSS feed" %}"><img src="{% media "media/images/feed-icon-small.png" %}" alt=""></a>\r
-    {% question_sort_tabs sort_context %}\r
+    {% include "question_list/title.html" %}\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
+    {{ questions.paginator.sort_tabs }}\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
-    <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
-    {% question_list_count %}\r
+    {% include "question_list/count.html" %}\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