X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..c6c168511f18d8984901b2c828a47310a2d54d64:/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 9b08cfc..4eb3c3b 100644
--- a/forum/skins/default/templates/question_list/item.html
+++ b/forum/skins/default/templates/question_list/item.html
@@ -1,36 +1,35 @@
-{% load i18n %}
-{% load humanize %}
-{% load extra_filters %}
-{% load extra_tags %}
-{% load user_tags %}
-
+{% load i18n humanize extra_filters extra_tags user_tags %}
 <div class="short-summary">
-    <div class="counts">
+    <div class="counts">{% if favorite_count %}
+        <div class="favorites">
+            <span class="favorite-mark{% if question.favourite_count %} on{% endif %}"></span>
+            <div class="item-count">{{question.favourite_count|intcomma}}</div>
+        </div>
+        {% endif %}
         <div class="votes">
             <div class="item-count">{{question.score|intcomma}}</div>
-            <div>{% trans "votes" %}</div>
+            <div>{% ifequal question.score 1 %}{% trans "vote" %}{% else %}{% trans "votes" %}{% endifequal %}</div>
         </div >
-        <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 %}">
+        <div {% if question.accepted_count %}title="{% trans "this question has an accepted answer" %}"{% endif %} class="status {% if question.accepted_count %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
             <div class="item-count">{{question.answer_count|intcomma}}</div>
-            <div>{% trans "answers" %}</div>
+            <div>{% ifequal question.answer_count 1 %}{% trans "answer" %}{% else %}{% trans "answers" %}{% endifequal %}</div>
         </div>
         <div class="views">
-             <div class="item-count">{{question.view_count|cnprog_intword|safe}}</div>
-             <div>{% trans "views" %}</div>
+             <div class="item-count">{{question.view_count|decorated_int|safe}}</div>
+             <div>{% ifequal question.view_count 1 %}{% trans "view" %}{% else %}{% trans "views" %}{% endifequal %}</div>
         </div>
     </div>
 
-    <h2><a title="{{question.summary}}" href="{{ question.get_absolute_url }}">{{question.title}}</a></h2>
-    <div class="userinfo">
-        <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
-        {% if question.last_activity_by %}
-            {% user_signature_small_lite question.last_activity_by %}
-        {% endif %}
-    </div>
+    <div class="question-summary-wrapper">
+        <h2><a title="{{ question.summary }}" href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2>
+        <div class="userinfo">
+            <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
+            {% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}
+        </div>
 
-    <div class="tags">
-        {% for tag in question.tagname_list %}
-        <a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
-        {% endfor %}
+        <div class="tags">{% for tag in question.tagname_list %}
+            <a class="tag-link-{{ tag }}" href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}'" rel="tag">{{ tag }}</a>{% endfor %}
+        </div>
     </div>
+
 </div>
\ No newline at end of file