You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/20 16:15:35 UTC
svn commit: r509599 - in /lenya/trunk/src/modules-core:
administration/usecases/group.jx administration/usecases/groupProfile.jx
administration/usecases/user.jx administration/usecases/userProfile.jx
usecase/usecases.js
Author: andreas
Date: Tue Feb 20 07:15:31 2007
New Revision: 509599
URL: http://svn.apache.org/viewvc?view=rev&rev=509599
Log:
Fixed some layout and i18n problems
Modified:
lenya/trunk/src/modules-core/administration/usecases/group.jx
lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx
lenya/trunk/src/modules-core/administration/usecases/user.jx
lenya/trunk/src/modules-core/administration/usecases/userProfile.jx
lenya/trunk/src/modules-core/usecase/usecases.js
Modified: lenya/trunk/src/modules-core/administration/usecases/group.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/group.jx?view=diff&rev=509599&r1=509598&r2=509599
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/group.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/group.jx Tue Feb 20 07:15:31 2007
@@ -38,6 +38,10 @@
</td>
</tr>
<tr>
+ <td class="lenya-entry-caption"><i18n:text>Group ID</i18n:text>:</td>
+ <td><jx:out value="${group.getId()}"/></td>
+ </tr>
+ <tr>
<td class="lenya-entry-caption"><i18n:text>Name</i18n:text>:</td>
<td><jx:out value="${group.getName()}"/></td>
</tr>
@@ -63,9 +67,9 @@
<tr>
<td valign="top" class="lenya-entry-caption"><i18n:text>Members</i18n:text>:</td>
<td>
- <jx:forEach var="member" items="${group.getMembers()}">
- <jx:out value="${member.getId() + ' '}"/>
- </jx:forEach>
+ <jx:set var="members" value="${group.getMembers()}"/>
+ <jx:forEach var="member" items="${members}"><jx:if test="${member != members[0]}">, </jx:if>
+ <a href="?lenya.usecase=admin.user&userId=${member.getId()}"><jx:out value="${member.getId()}"/></a></jx:forEach>
</td>
</tr>
<tr>
Modified: lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx?view=diff&rev=509599&r1=509598&r2=509599
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx Tue Feb 20 07:15:31 2007
@@ -40,15 +40,15 @@
</td>
</tr>
<tr>
- <td class="lenya-entry-caption"><i18n:text>Group ID</i18n:text></td>
+ <td class="lenya-entry-caption"><i18n:text>Group ID</i18n:text>:</td>
<td><jx:out value="${usecase.getParameter('groupId')}"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="name"><i18n:text>Name</i18n:text></label></td>
+ <td class="lenya-entry-caption"><label for="name"><i18n:text>Name</i18n:text>:</label></td>
<td><input type="text" name="name" class="lenya-form-element" value="${usecase.getParameter('name')}"/></td>
</tr>
<tr>
- <td valign="top" class="lenya-entry-caption"><label for="description"><i18n:text>Description</i18n:text></label></td>
+ <td valign="top" class="lenya-entry-caption"><label for="description"><i18n:text>Description</i18n:text>:</label></td>
<td>
<!-- N.B.: do not put spaces or carriage returns inside the
textarea element - these would be rendered -->
Modified: lenya/trunk/src/modules-core/administration/usecases/user.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/user.jx?view=diff&rev=509599&r1=509598&r2=509599
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/user.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/user.jx Tue Feb 20 07:15:31 2007
@@ -39,6 +39,10 @@
</td>
</tr>
<tr>
+ <td class="lenya-entry-caption"><i18n:text>User ID</i18n:text>:</td>
+ <td><jx:out value="${usecase.getParameter('userId')}"/></td>
+ </tr>
+ <tr>
<td class="lenya-entry-caption"><i18n:text>Name</i18n:text>:</td>
<td><jx:out value="${user.getName()}"/></td>
</tr>
@@ -97,9 +101,8 @@
<td>
<jx:set var="groups" value="${user.getGroups()}"/>
<jx:if test="${groups.size() == 0}"><i18n:text>No groups assigned</i18n:text></jx:if>
- <jx:forEach var="group" items="${groups}">
- <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
- </jx:forEach>
+ <jx:forEach var="group" items="${groups}"><jx:if test="${group != groups[0]}">, </jx:if>
+ <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a></jx:forEach>
</td>
</tr>
Modified: lenya/trunk/src/modules-core/administration/usecases/userProfile.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/userProfile.jx?view=diff&rev=509599&r1=509598&r2=509599
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/userProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/userProfile.jx Tue Feb 20 07:15:31 2007
@@ -40,11 +40,15 @@
</td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="name"><i18n:text>Name</i18n:text> *</label></td>
+ <td class="lenya-entry-caption"><i18n:text>User ID</i18n:text>:</td>
+ <td><jx:out value="${usecase.getParameter('userId')}"/></td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption"><label for="name"><i18n:text>Name</i18n:text> *</label>:</td>
<td><input type="text" name="fullName" class="lenya-form-element" value="${usecase.getParameter('fullName')}"/></td>
</tr>
<tr>
- <td valign="top" class="lenya-entry-caption"><label for="description"><i18n:text>Description</i18n:text></label></td>
+ <td valign="top" class="lenya-entry-caption"><label for="description"><i18n:text>Description</i18n:text>:</label></td>
<td>
<!-- N.B.: do not put spaces or carriage returns inside the
textarea element - these would be rendered -->
@@ -53,17 +57,17 @@
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="email"><i18n:text>E-Mail</i18n:text> *</label></td>
+ <td class="lenya-entry-caption"><label for="email"><i18n:text>E-Mail</i18n:text> *</label>:</td>
<td><input type="text" name="email" class="lenya-form-element" value="${usecase.getParameter('email')}"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="defaultMenuLocale"><i18n:text>Default Menu Locale</i18n:text></label></td>
+ <td class="lenya-entry-caption"><label for="defaultMenuLocale"><i18n:text>Default Menu Locale</i18n:text>:</label></td>
<td><input type="text" name="defaultMenuLocale" class="lenya-form-element" value="${usecase.getParameter('defaultMenuLocale')}"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="defaultDocumentLocale"><i18n:text>Default Document Locale</i18n:text></label></td>
+ <td class="lenya-entry-caption"><label for="defaultDocumentLocale"><i18n:text>Default Document Locale</i18n:text>:</label></td>
<td><input type="text" name="defaultDocumentLocale" class="lenya-form-element" value="${usecase.getParameter('defaultDocumentLocale')}"/></td>
</tr>
Modified: lenya/trunk/src/modules-core/usecase/usecases.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/usecases.js?view=diff&rev=509599&r1=509598&r2=509599
==============================================================================
--- lenya/trunk/src/modules-core/usecase/usecases.js (original)
+++ lenya/trunk/src/modules-core/usecase/usecases.js Tue Feb 20 07:15:31 2007
@@ -330,8 +330,8 @@
if (view != null && view.getViewURI()) {
do {
// show the view:
- try {
loopFlow(view, proxy, generic); //usecase must be released here!
+ try {
} catch (exception) {
// if something went wrong, try and rollback the usecase:
log("error", "Exception during loopFlow(): " + exception, usecaseName);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org