Merging the experimental branch back to trunk.

[osqa.git] / forum / skins / default / templates / users / stats.html

diff --git a/forum/skins/default/templates/users/stats.html b/forum/skins/default/templates/users/stats.html
index 96a1f36d17723a57b500ce098baf08becd422e53..adc6e12652151fb8728ed11d905308b0c830edf1 100644 (file)
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -45,17 +45,8 @@
                 </a>
                 <div class="answer-link">
                     {% spaceless %}
-                    <a href="{{ answer.get_absolute_url }}#{{answer.id}}">{{answer.question.title}}</a>
+                    <a href="{{ answer.get_absolute_url }}">{{answer.headline}}</a>
                     {% endspaceless %}
-                    {% if answer.comment_count %}
-                    <span>
-                                   {% blocktrans count answer.comment_count as comment_count %}
-                    (one comment)
-                    {% plural %}
-                    the answer has been commented {{comment_count}} times
-                    {% endblocktrans %}
-                    </span> 
-                    {% endif %}
                 </div>
             </div>
             {% endfor %}
@@ -129,8 +120,8 @@
             <table>
                 <tr>
                     <td width="180" style="line-height:35px">
-                        {% for award in awards %}
-                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#215; {{ award.count|intcomma }}</span><br/>
+                        {% for award, count in awards %}
+                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#215; {{ count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">