[Yanel-commits] rev 43922 - in public/yanel/trunk/src:
contributions/resources/yanel-user/xslt resources/user-mgmt/htdocs
guillaume at wyona.com
guillaume at wyona.com
Thu Jul 30 16:31:09 CEST 2009
Author: guillaume
Date: 2009-07-30 16:31:09 +0200 (Thu, 30 Jul 2009)
New Revision: 43922
Modified:
public/yanel/trunk/src/contributions/resources/yanel-user/xslt/yanel-user-profile.xsl
public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly
Log:
Big UI cleanup (labels, linking, ...) according to Simone's remarks and dead-tree spec.
Issue: 6897
Modified: public/yanel/trunk/src/contributions/resources/yanel-user/xslt/yanel-user-profile.xsl
===================================================================
--- public/yanel/trunk/src/contributions/resources/yanel-user/xslt/yanel-user-profile.xsl 2009-07-30 13:31:28 UTC (rev 43921)
+++ public/yanel/trunk/src/contributions/resources/yanel-user/xslt/yanel-user-profile.xsl 2009-07-30 14:31:09 UTC (rev 43922)
@@ -27,21 +27,20 @@
<xsl:choose>
<xsl:when test="contains('true',$deletion)">
<head>
- <title></title>
<link type="text/css" href="{$yanel.back2realm}{$yanel.reservedPrefix}/yanel-css/global.css" rel="stylesheet"></link>
</head>
- <body>
+ <body>
<xsl:call-template name="show-message"/>
</body>
</xsl:when>
<xsl:otherwise>
<head>
- <title>Change user profile</title>
+ <title>Edit user profile</title>
<link type="text/css" href="{$yanel.back2realm}{$yanel.reservedPrefix}/yanel-css/global.css" rel="stylesheet"></link>
</head>
- <body>
+ <body>
<table id="bodytable" cellpadding="0" cellspacing="0"><tr><td id="title">
- Change user profile of <xsl:value-of select="$userId"/>
+ Edit user profile of <xsl:value-of select="$userId"/>
</td><td id="logo"><img src="{$yanel.back2realm}{$yanel.reservedPrefix}/yanel-img/yanel_header.png"/></td></tr><tr><td colspan="2" valign="top" width="100%"><div id="content">
<h1>
User Profile of <xsl:value-of select="$userId"/>
@@ -61,13 +60,13 @@
<p>
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td>Enter current password:</td>
+ <td>Current password:</td>
<td>
<input type="password" name="oldPassword"/>
</td>
</tr>
<tr>
- <td>Enter new password:</td>
+ <td>New password:</td>
<td>
<input type="password" name="newPassword"/>
</td>
@@ -80,14 +79,14 @@
</tr>
<tr>
<td colspan="2">
- <input type="submit" name="submitPassword" value="Change Password"/>
+ <input type="submit" name="submitPassword" value="Apply"/>
</td>
</tr>
</table>
</p>
</form>
- <h2>Change Profile</h2>
+ <h2>Change Identity</h2>
<form name="user-profile-form" method="post" action="#">
<p>
<table>
@@ -104,6 +103,18 @@
</td>
</tr>
<tr>
+ <td colspan="2">
+ <input type="submit" name="submitProfile" value="Apply"/>
+ </td>
+ </tr>
+ </table>
+ </p>
+ </form>
+
+ <h2>Account info</h2>
+ <p>
+ <table>
+ <tr>
<td>Language:</td>
<td><xsl:value-of select="$user-profile-language"/></td>
</tr>
@@ -115,14 +126,8 @@
<td>Description:</td>
<td><xsl:value-of select="$description"/></td>
</tr>
- <tr>
- <td colspan="2">
- <input type="submit" name="submitProfile" value="Change Profile"/>
- </td>
- </tr>
</table>
</p>
- </form>
<h2>Groups</h2>
Groups which this user belongs to: <xsl:value-of select="$userGroupsString"/>
Modified: public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly 2009-07-30 13:31:28 UTC (rev 43921)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly 2009-07-30 14:31:09 UTC (rev 43922)
@@ -14,9 +14,9 @@
<br/>
Password: <input type="password" name="password1"/>
<br/>
- Password: <input type="password" name="password2"/>
+ Confirm password: <input type="password" name="password2"/>
<br/>
- <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="submit" value="Create"/>
<input type="submit" name="cancel" value="Cancel"/>
</form>
</body>
Modified: public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly 2009-07-30 13:31:28 UTC (rev 43921)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly 2009-07-30 14:31:09 UTC (rev 43922)
@@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core">
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
- <h1>Update User: ${resource.getParameterAsString('userID')}</h1>
+ <h1>Edit User: ${resource.getParameterAsString('userID')}</h1>
<p>${resource.getErrorMessages()}</p>
<form action="" >
<input type="hidden" name="userID" value="${resource.getParameterAsString('userID')}"/>
@@ -15,7 +15,7 @@
<br/>
New Password: <input type="password" name="password1"/>
<br/>
- New Password: <input type="password" name="password2"/>
+ Confirm new password: <input type="password" name="password2"/>
<br/>
Group Affiliation:
@@ -37,7 +37,7 @@
</j:forEach>
</table>
- <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="submit" value="Submit"/>
<input type="submit" name="cancel" value="Cancel"/>
</form>
</body>
Modified: public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly 2009-07-30 13:31:28 UTC (rev 43921)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly 2009-07-30 14:31:09 UTC (rev 43922)
@@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core">
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
- <h1>Usecase cancelled</h1>
+ <h1>Operation cancelled</h1>
<a href="list-users.html">Show list of users</a>
<br/>
<a href="list-groups.html">Show list of groups</a>
Modified: public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly 2009-07-30 13:31:28 UTC (rev 43921)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly 2009-07-30 14:31:09 UTC (rev 43922)
@@ -2,7 +2,7 @@
<j:jelly xmlns:j="jelly:core">
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
- <h1>Usecase done</h1>
+ <h1>Operation done</h1>
<p>${resource.getErrorMessages()}</p>
<p>${resource.getInfoMessages()}</p>
More information about the Yanel-commits
mailing list