From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 Dec 2012 11:41:54 +0000 (+0100)
Subject: Redesign users list.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3da206e177acbe604ce06b12e575e7650fb9e52b;p=people%2Fjschlag%2Fpbs.git

Redesign users list.
---

diff --git a/backend/users.py b/backend/users.py
index c86b796..1e50627 100644
--- 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 9ff2287..652ea00 100644
--- 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 16db967..77e4a17 100644
--- 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 c754938..a98c6cb 100644
--- 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):