ALteration of the schema to a single content model. As a bonus there is a complete...

[osqa.git] / forum / skins / default / templates / question_list / item.html

diff --git a/forum/skins/default/templates/question_list/item.html b/forum/skins/default/templates/question_list/item.html
index 9b08cfc51910638b4c37024d5c18fec104357dca..e4998488d35816d89c946697ec5480e176a1901a 100644 (file)
--- a/forum/skins/default/templates/question_list/item.html
+++ b/forum/skins/default/templates/question_list/item.html
@@ -1,16 +1,15 @@
-{% load i18n %}\r
-{% load humanize %}\r
-{% load extra_filters %}\r
-{% load extra_tags %}\r
-{% load user_tags %}\r
-\r
+{% load i18n humanize extra_filters extra_tags user_tags %}\r
 <div class="short-summary">\r
-    <div class="counts">\r
-        <div class="votes">\r
+    <div class="counts">{% if favorite_count %}\r
+        <div class="favorites">\r
+            <span class="favorite-mark{% if question.favourite_count %} on{% endif %}"></span>\r
+            <div class="item-count">{{question.favourite_count|intcomma}}</div>\r
+        </div>\r
+        {% endif %}<div class="votes">\r
             <div class="item-count">{{question.score|intcomma}}</div>\r
             <div>{% trans "votes" %}</div>\r
         </div >\r
-        <div {% if question.answer_accepted %}title="{% trans "this answer has been accepted to be correct" %}"{% endif %} class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">\r
+        <div {% if question.answer_accepted %}title="{% trans "this question has an accepted answer" %}"{% endif %} class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">\r
             <div class="item-count">{{question.answer_count|intcomma}}</div>\r
             <div>{% trans "answers" %}</div>\r
         </div>\r
@@ -20,17 +19,13 @@
         </div>\r
     </div>\r
 \r
-    <h2><a title="{{question.summary}}" href="{{ question.get_absolute_url }}">{{question.title}}</a></h2>\r
+    <h2><a title="{{ question.summary }}" href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2>\r
     <div class="userinfo">\r
         <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>\r
-        {% if question.last_activity_by %}\r
-            {% user_signature_small_lite question.last_activity_by %}\r
-        {% endif %}\r
+        {% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}\r
     </div>\r
 \r
-    <div class="tags">\r
-        {% for tag in question.tagname_list %}\r
-        <a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>\r
-        {% endfor %}\r
+    <div class="tags">{% for tag in question.tagname_list %}\r
+        <a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>{% endfor %}\r
     </div>\r
 </div>
\ No newline at end of file