Makes tags and users lists use the new paginators, completelly remove the old cnprog...

[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 6381b59691726beee42c5537628384dbd3297737..d3806d91f8b46ab1566b994a4416a42a21c51ac5 100644 (file)
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -6,11 +6,21 @@
 {% load humanize %}
 {% load question_list_tags %}
                {% block usercontent %}
 {% load humanize %}
 {% load question_list_tags %}
                {% block usercontent %}

+
+               {% declare %}
+                   question_count = questions.count()
+                   show_more_questions_link = question_count > 15
+                   questions = questions[:15]
+
+                   answer_count = answers.count()
+                   show_more_answers_link = answer_count > 30
+                   answers = answers[:30]
+               {% enddeclare %}

        
         <a name="questions"></a>
         {% spaceless %}
             <h2>
        
         <a name="questions"></a>
         {% spaceless %}
             <h2>

-                {% blocktrans count questions|length as counter %}
+                {% blocktrans count question_count as counter %}

                 <span class="count">1</span> Question
                 {% plural %}
                 <span class="count">{{counter}}</span> Questions
                 <span class="count">1</span> Question
                 {% plural %}
                 <span class="count">{{counter}}</span> Questions


@@ -21,12 +31,17 @@
                    {% for question in questions %}
                        {% question_list_item question favorite_count=yes signature_type=badges %}
                    {% endfor %}
                    {% for question in questions %}
                        {% question_list_item question favorite_count=yes signature_type=badges %}
                    {% endfor %}

+            {% if show_more_questions_link %}
+                <div class="short-summary"  style="text-align: right">
+                    <a href="{{ view_user.get_asked_url }}">{% blocktrans with view_user.username as username %}View all questions by {{ username }}{% endblocktrans %}</a>
+                </div>
+            {% endif %}

                </div>
                <br clear="all"/>
         <a name="answers"></a>
         {% spaceless %}
             <h2>
                </div>
                <br clear="all"/>
         <a name="answers"></a>
         {% spaceless %}
             <h2>

-                {% blocktrans count answers|length as counter %}
+                {% blocktrans count answer_count as counter %}

                 <span class="count">1</span> Answer
                 {% plural %}
                 <span class="count">{{counter}}</span> Answers
                 <span class="count">1</span> Answer
                 {% plural %}
                 <span class="count">{{counter}}</span> Answers


@@ -38,8 +53,8 @@
             <div class="answer-summary">
                 <a title="{{answer.question.title}}"
                     href="{{ answer.get_absolute_url }}">
             <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>
                         {{ answer.score }}
                     </span>
                 </a>


@@ -50,8 +65,13 @@
                 </div>
             </div>
             {% endfor %}
                 </div>
             </div>
             {% endfor %}

+            {% if show_more_answers_link %}
+                <div class="short-summary"  style="text-align: right">
+                    <a href="{{ view_user.get_answered_url }}">{% blocktrans with view_user.username as username %}View all questions answered by {{ username }}{% endblocktrans %}</a>
+                </div>
+            {% endif %}

         </div>
         </div>

-        <br/>
+        <br clear="all"/>

         <a name="votes"></a>
         {% spaceless %}
             <h2>
         <a name="votes"></a>
         {% spaceless %}
             <h2>


@@ -120,8 +140,8 @@
             <table>
                 <tr>
                     <td width="180" style="line-height:35px">
             <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|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/>

                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">