OSQA-809, Include question summaries in question and answers views, wrap that in...

[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 ef7df5898610c2113354579d98f23f4b5c2e2842..f470ba3ef36fb58e5ed971a911ddb8d137660c04 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -3,42 +3,47 @@
 {% load question_list_tags %}\r
 {% load i18n %}\r
 {% load extra_tags %}\r
 {% load question_list_tags %}\r
 {% load i18n %}\r
 {% load extra_tags %}\r

+{% load general_sidebar_tags %}\r

 \r
 \r

-{% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}\r
-{% block forejs %}\r
-       <script type="text/javascript">\r
-           var tags = {{ tags_autocomplete|safe }};\r
-           $().ready(function(){\r
-               var tab_id = "{{ tab_id }}";\r
-               $("#"+tab_id).attr('className',"on");\r
-               var on_tab = {% if is_unanswered %}'#nav_unanswered'{% else %}'#nav_questions'{% endif %};\r
-               $(on_tab).attr('className','on');\r
-               Hilite.exact = false;\r
-               Hilite.elementid = "listA";\r
-               Hilite.debug_referrer = location.href;\r
-           });\r
-       </script>\r
+{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
+\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
 {% endblock %}\r

+\r

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

+\r

 <div class="tabBar">\r
 <div class="tabBar">\r

-    {% question_list_title %}\r
-    {% question_sort_tabs sort_context %}\r
-</div>\r
-<div id="listA">\r
-{% for question in questions %}\r
-    {% question_list_item question %}\r
-{% endfor %}\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>\r

+<div id="listA">{% for question in questions.paginator.page %}\r
+    {% if show_summary %}\r
+      {% question_list_item question question_summary=yes %}\r
+    {% else %}\r
+      {% question_list_item question %}\r
+    {% endif %}\r
+{% endfor %}</div>\r

 {% endblock %}\r
 \r
 {% block tail %}\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

-    {% question_list_count %}\r
+    {% include "question_list/count.html" %}\r
+    {% sidebar_upper %}\r

     {% tag_selector %}\r
     {% tag_selector %}\r

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

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