Redesign users list.

diff --git a/backend/users.py b/backend/users.py
index c86b796dc90cb7233253ce22960ba53b7a5bca98..1e506278fbf97023bb206d12a2815070fbbd876b 100644 (file)
--- a/backend/users.py
+++ b/backend/users.py
@@ -152,7 +152,7 @@ class Users(base.Object):
 
        def get_all(self):
                users = self.db.query("""SELECT id FROM users WHERE activated = 'Y' AND
-                       deleted = 'N' ORDER BY realname, name""")
+                       deleted = 'N' ORDER BY name ASC""")
 
                return [User(self.pakfire, u.id) for u in users]
 

diff --git a/data/templates/modules/user-table.html b/data/templates/modules/user-table.html
index 9ff2287c97bff5348583fd38c191a2391cfa58d5..652ea00e9ce335d2e499ca7cf409b2c2d4129e69 100644 (file)
--- a/data/templates/modules/user-table.html
+++ b/data/templates/modules/user-table.html
@@ -1,5 +1,17 @@
-<ul>
-       {% for user in users %}
-               <li><a href="/user/{{ user.name }}">{{ user.realname }}</a></li>
-       {% end %}
-</ul>
+<table class="table table-striped table-hover">
+       <tbody>
+               {% for u in users %}
+                       <tr>
+                               <td>
+                                       <img class="pull-right" src="{{ u.gravatar_icon(64) }}" alt="{{ u.realname }}">
+
+                                       <a href="/user/{{ u.name }}">{{ u.realname }}</a>
+                                       <br>
+                                       {% if not u.name == u.realname %}
+                                               <span class="muted">{{ u.name }}</span>
+                                       {% end %}
+                               </td>
+                       </tr>
+               {% end %}
+       </tbody>
+</table>

diff --git a/data/templates/user-list.html b/data/templates/user-list.html
index 16db9672ff40c5f631e4696542d9bd8c1a23a247..77e4a17b8ca99d0fe441b343f5a25a0255e46ab4 100644 (file)
--- a/data/templates/user-list.html
+++ b/data/templates/user-list.html
@@ -13,32 +13,9 @@
                </li>
        </ul>
 
-       <h1>{{ _("Users") }}</h1>
-       <p>
-               {{ _("On this page you can see a list of all users that are known to the system.") }}
-       </p>
+       <div class="page-header">
+               <h2>{{ _("Users") }}</h2>
+       </div>
 
-       {% if admins %}
-               <h2>
-                       {{ _("Developers") }}
-                       <span>({{ len(admins) }})</span>
-               </h2>
-               {% module UsersTable(admins) %}
-       {% end %}
-
-       {% if testers %}
-               <h2>
-                       {{ _("Testers") }}
-                       <span>({{ len(testers) }})</span>
-               </h2>
-               {% module UsersTable(testers) %}
-       {% end %}
-
-       {% if users %}
-               <h2>
-                       {{ _("Users") }}
-                       <span>({{ len(admins) }})</span>
-               </h2>
-               {% module UsersTable(users) %}
-       {% end %}
+       {% module UsersTable(users) %}
 {% end block %}

diff --git a/web/handlers_users.py b/web/handlers_users.py
index c754938e9c0550b447561e803e7117855ddb8d87..a98c6cb44919c894debc20d9af4b3f70cb42b75e 100644 (file)
--- a/web/handlers_users.py
+++ b/web/handlers_users.py
@@ -211,18 +211,9 @@ class UserEditHandler(BaseHandler):
 class UsersHandler(BaseHandler):
        @tornado.web.authenticated
        def get(self):
-               admins, testers, users = [], [], []
+               users = self.pakfire.users.get_all()
 
-               for user in self.pakfire.users.get_all():
-                       if user.is_admin():
-                               admins.append(user)
-                       elif user.is_tester():
-                               testers.append(user)
-                       else:
-                               users.append(user)
-
-               self.render("user-list.html", admins=admins, testers=testers,
-                       users=users)
+               self.render("user-list.html", users=users)
 
 
 class UsersCommentsHandler(BaseHandler):