X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/e56473b84a25d665bd56725cafc4cc284121ed93..77c7fb49881b1df98ce3584468105ba78740fd48:/forum/skins/default/templates/users/users.html?ds=sidebyside

diff --git a/forum/skins/default/templates/users/users.html b/forum/skins/default/templates/users/users.html
index a79058d..d7e01db 100644
--- a/forum/skins/default/templates/users/users.html
+++ b/forum/skins/default/templates/users/users.html
@@ -8,7 +8,6 @@
        <script type="text/javascript">
 	   //todo move javascript out
         $().ready(function(){
-            $("#nav_users").attr('className',"on");
             $("#type-user").attr('checked',true);
             var orderby = "{{ tab_id }}";
             $("#sort_" + orderby).attr('className',"on");
@@ -22,12 +21,7 @@
 {% block content %}
 <div class="tabBar">
     <div class="headUsers">{% trans "Users" %}</div>
-    <div class="tabsA">
-        <a id="sort_reputation" href="{% url users %}?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
-        <a id="sort_newest" href="{% url users %}?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
-        <a id="sort_last" href="{% url users %}?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
-        <a id="sort_user" href="{% url users %}?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
-    </div>
+    {{ users.paginator.sort_tabs }}
 </div>
 <div id="main-body" style="width:100%">
     <p>        
@@ -35,39 +29,26 @@
 			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
         {% endif %}
     
-        {% if not users.object_list %}
+        {% if not users.paginator.count %}
             <span>{% trans "Nothing found." %}</span>
         {% endif %}
     </p>
     <div class="userList">
-        <table class="list-table">
-            <tr>    
-                <td class="list-td">
-                    {% for user in users.object_list %}
-                    
-                    <div class="user">
-                        <ul>
-                            <li class="thumb"><a href="{{ user.get_profile_url }} ">{% gravatar user 32 %}</a></li>
-                            <li><a {% if user.is_suspended %}class="suspended-user" {% endif %}href="{{ user.get_profile_url }}">{{ user.username }}</a></li>
-                            <li>{% get_score_badge user %}</li>
-                        </ul>
-                    </div>
-                    
-            {% if forloop.counter|divisibleby:"7" %}
-                </td>
-                <td>
-            {% endif %}
-
-                    {% endfor %}
-                </td>
-            </tr>   
-        </table>
+        {% for user in users.paginator.page %}
+        <div class="user">
+            <ul>
+                <li class="thumb"><a href="{{ user.get_profile_url }} ">{% gravatar user 32 %}</a></li>
+                <li><a {% if user.is_suspended %}class="suspended-user" {% endif %}href="{{ user.get_profile_url }}">{{ user.decorated_name }}</a></li>
+                <li>{% get_score_badge user %}</li>
+            </ul>
+        </div>
+        {% endfor %}
     </div>
 </div>
 {% endblock %}
 {% block tail %}
 <div class="pager">
-    {% cnprog_paginator context %}
+    {{ users.paginator.page_numbers }}
 </div>              
 {% endblock %}
 <!-- end users.html -->