X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/502145bac5a6688653e7d73155ee90a1e0183432..4bbb2156110a75e84ef95ee28ba31490d986b870:/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 7acacbd..bcc2f52 100644
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -6,12 +6,12 @@
 {% load humanize %}
 {% load question_list_tags %}
 		{% block usercontent %}
-
+    <div id="questionsBlock" class="userSection">
         <a name="questions"></a>
         {% spaceless %}
             <h2>
                 {% blocktrans count questions.paginator.count as counter %}
-                <span class="count">1</span> Question
+                <span class="count">{{counter}}</span> Question
                 {% plural %}
                 <span class="count">{{counter}}</span> Questions
                 {% endblocktrans %}
@@ -19,7 +19,7 @@
                     href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
             </h2>
         {% endspaceless %}
-        <div>{{ questions.paginator.sort_tabs }}</div>
+        <div id="questionTabs">{{ questions.paginator.sort_tabs }}</div>
 		<div id="listA" class="user-stats-table">
 		    {% for question in questions.paginator.page %}
 		        {% question_list_item question favorite_count=yes signature_type=badges %}
@@ -28,18 +28,20 @@
 		<br clear="all"/>
 		<div class="pager">{{ questions.paginator.page_numbers }}</div>
 		<br clear="all"/>
+    </div>
 
+    <div id="answersBlock" class="userSection">
         <a name="answers"></a>
         {% spaceless %}
             <h2>
                 {% blocktrans count answers.paginator.count as counter %}
-                <span class="count">1</span> Answer
+                <span class="count">{{counter}}</span> Answer
                 {% plural %}
                 <span class="count">{{counter}}</span> Answers
                 {% endblocktrans %}
             </h2>
         {% endspaceless %}
-        <div>{{ answers.paginator.sort_tabs }}</div>
+        <div id="answerTabs">{{ answers.paginator.sort_tabs }}</div>
         <div class="user-stats-table">
             {% for answer in answers.paginator.page %}
             <div class="answer-summary">
@@ -61,11 +63,14 @@
         <br clear="all"/>
 		<div class="pager">{{ answers.paginator.page_numbers }}</div>
         <br clear="all"/>
+    </div>
+
+
         <a name="votes"></a>
         {% spaceless %}
             <h2>
                 {% blocktrans count total_votes as cnt %}
-                    <span class="count">1</span> Vote
+                    <span class="count">{{cnt}}</span> Vote
                 {% plural %}
                     <span class="count">{{cnt}}</span> Votes
                 {% endblocktrans %}
@@ -91,7 +96,7 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count user_tags|length as counter %}
-                    <span class="count">1</span> Tag
+                    <span class="count">{{counter}}</span> Tag
                 {% plural %}
                     <span class="count">{{counter}}</span> Tags
                 {% endblocktrans %}
@@ -103,8 +108,9 @@
                     <td valign="top" style="padding-right: 20px;">
                         {% for tag in user_tags%}
                         <a rel="tag" 
-							title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" 
-							href="{% url tag_questions tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
+                            class="tag-link-{{ tag.name }}"
+							title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}"
+							href="{% url "tag_questions" tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
                         <span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"10" %}
                                 </td>
@@ -119,7 +125,7 @@
         {% spaceless %}
         <h2>
             {% blocktrans count total_awards as counter %}
-            <span class="count">1</span> Badge
+            <span class="count">{{counter}}</span> Badge
             {% plural %}
             <span class="count">{{counter}}</span> Badges
             {% endblocktrans %}
@@ -130,11 +136,18 @@
                 <tr style="vertical-align: top;">
                     <td style="line-height:35px; padding-right: 20px;">
                         {% for award, count in awards %}
-                            <a href="{% url badges %}{{award.id}}/{{award.name|slugify}}" 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/>
+                            {% spaceless %}
+                            <a href="{% url "badges" %}{{award.id}}/{{award.name|slugify}}" title="{{ award.description }}" class="medal">
+                                <span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}
+                            </a>
+                            {% ifnotequal count 1 %}
+                                <span class="tag-number"> &#215; {{ count|intcomma }}</span>
+                            {% endifnotequal %}<br/>
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">
                             {% endif %}
+                            {% endspaceless %}
                         {% endfor %}
                     </td>
                 </tr>