[Yanel-commits] rev 56028 - public/yanel/trunk/src/resources/user-mgmt/htdocs

Wed Jan 12 21:54:33 CET 2011

Author: michi
Date: 2011-01-12 21:54:33 +0100 (Wed, 12 Jan 2011)
New Revision: 56028

Modified:
   public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly
Log:
display aliases

Modified: public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly
===================================================================

--- public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly	2011-01-12 20:53:55 UTC (rev 56027)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly	2011-01-12 20:54:33 UTC (rev 56028)
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <j:jelly xmlns:j="jelly:core">
   <html xmlns="http://www.w3.org/1999/xhtml">
     <body>
@@ -34,18 +35,36 @@
       <!-- Table of users -->
       <table border="1">
         <tr>
+          <th>Actions</th>
           <th>ID</th>
           <th>Name</th>
           <th>Email</th>
-          <th colspan="2">Actions</th>
+          <th>Aliases</th>
         </tr>
         <j:forEach var="user" items="${resource.getUsers()}">
           <tr>
-            <td>${user.getID()}</td>
-            <td>${user.getName()}</td>
-            <td>${user.getEmail()}</td>
-            <td><a href="update-user-admin.html?userID=${user.getID()}">Update/Edit</a></td>
-            <td><a href="delete-user.html?userID=${user.getID()}">Delete</a></td>
+            <td valign="top">
+              <a href="update-user-admin.html?userID=${user.getID()}">Update/Edit</a><br/>
+              <a href="delete-user.html?userID=${user.getID()}">Delete</a>
+            </td>
+            <td valign="top"><a href="update-user-admin.html?userID=${user.getID()}">${user.getID()}</a></td>
+            <td valign="top">${user.getName()}</td>
+            <td valign="top">${user.getEmail()}</td>
+      <j:choose>
+      <j:when test="${user.getAliases().size() &gt; 0}">
+        <td valign="top">
+        <j:forEach var="alias" items="${user.getAliases()}">
+          ${alias}<br/>
+        </j:forEach>
+        </td>
+      </j:when>
+      <j:otherwise>
+            <td valign="top">-</td>
+      </j:otherwise>
+      </j:choose>
+<!--
+            <td valign="top">${user.getDescription()}</td>
+-->
           </tr>
         </j:forEach>
       </table>

