X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0f2d00f9d7d5d28149707f66c719b28edfe51aed..9a075e7d95c3b16c05011410de59196caaa86e66:/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 96a1f36..358771d 100644
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -6,66 +6,71 @@
 {% load humanize %}
 {% load question_list_tags %}
 		{% block usercontent %}
-	
+    <div id="questionsBlock" class="userSection">
         <a name="questions"></a>
         {% spaceless %}
             <h2>
-                {% blocktrans count questions|length as counter %}
-                <span class="count">1</span> Question
+                {% blocktrans count questions.paginator.count as counter %}
+                <span class="count">{{counter}}</span> Question
                 {% plural %}
                 <span class="count">{{counter}}</span> Questions
                 {% endblocktrans %}
+                <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"
+                    href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
             </h2>
         {% endspaceless %}
-		<div class="user-stats-table">
-		    {% for question in questions %}
+        <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 %}
 		    {% endfor %}
 		</div>
 		<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|length as counter %}
-                <span class="count">1</span> Answer
+                {% blocktrans count answers.paginator.count as counter %}
+                <span class="count">{{counter}}</span> Answer
                 {% plural %}
                 <span class="count">{{counter}}</span> Answers
                 {% endblocktrans %}
             </h2>
         {% endspaceless %}
+        <div id="answerTabs">{{ answers.paginator.sort_tabs }}</div>
         <div class="user-stats-table">
-            {% for answer in answers %}
+            {% for answer in answers.paginator.page %}
             <div class="answer-summary">
                 <a title="{{answer.question.title}}"
                     href="{{ answer.get_absolute_url }}">
-                    <span class="{% if answer.accepted %}answered-accepted {% endif %} answer-votes" 
-						title="{% blocktrans with answer.score as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answer.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
+                    <span class="{% if answer.nis.accepted %}answered-accepted {% endif %} answer-votes" 
+						title="{% blocktrans with answer.score as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answer.nis.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answer.score }}
                     </span>
                 </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 %}
         </div>
-        <br/>
+        <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 %}
@@ -99,11 +104,12 @@
         {% endspaceless %}
         <div class="user-stats-table">
             <table class="tags">
-                <tr>
-                    <td width="180" valign="top">
+                <tr style="vertical-align: top;">
+                    <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 %}" 
+                            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" %}
@@ -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 %}
@@ -127,14 +133,21 @@
         {% endspaceless %}
         <div class="user-stats-table">
             <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/>
+                <tr style="vertical-align: top;">
+                    <td style="line-height:35px; padding-right: 20px;">
+                        {% for award, count in awards %}
+                            {% 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>