[jboss-svn-commits] JBoss Portal SVN: r5404 - in trunk/core/src/resources/portal-core-war/WEB-INF: classes jsp/user

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Oct 10 13:57:47 EDT 2006


Author: roy.russo at jboss.com
Date: 2006-10-10 13:57:45 -0400 (Tue, 10 Oct 2006)
New Revision: 5404

Modified:
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
Log:
JBPORTAL-1073 - ui/functionality enhancements to userportlet.

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2006-10-10 17:38:46 UTC (rev 5403)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2006-10-10 17:57:45 UTC (rev 5404)
@@ -236,6 +236,8 @@
 LIST_ACTIONADDROLESTOUSER=Roles
 LIST_ACTIONEDITROLES=Edit Roles
 LIST_ACTIONDELETEUSER=Delete user
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
 FILTER=Filter
 
 NEXTPAGE=Next page

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties	2006-10-10 17:38:46 UTC (rev 5403)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties	2006-10-10 17:57:45 UTC (rev 5404)
@@ -234,6 +234,8 @@
 LIST_ACTIONADDROLESTOUSER=Roles
 LIST_ACTIONEDITROLES=Edit Roles
 LIST_ACTIONDELETEUSER=Delete user
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
 FILTER=Filter
 
 NEXTPAGE=Next page

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties	2006-10-10 17:38:46 UTC (rev 5403)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties	2006-10-10 17:57:45 UTC (rev 5404)
@@ -234,6 +234,8 @@
 LIST_ACTIONADDROLESTOUSER=Roles
 LIST_ACTIONEDITROLES=Editar Roles
 LIST_ACTIONDELETEUSER=Borrar el usario
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
 FILTER=Filtro
 
 NEXTPAGE=Página siguiente

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties	2006-10-10 17:38:46 UTC (rev 5403)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties	2006-10-10 17:57:45 UTC (rev 5404)
@@ -212,6 +212,8 @@
 LIST_ACTIONSSHOWPROFILE=Profil
 LIST_ACTIONADDROLESTOUSER=Roles
 LIST_ACTIONDELETEUSER=Delete user
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
 FILTER=Filtre
 
 NEXTPAGE=Page suivante

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp	2006-10-10 17:38:46 UTC (rev 5403)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp	2006-10-10 17:57:45 UTC (rev 5404)
@@ -177,7 +177,7 @@
 <tr>
    <td colspan="3" class="bottombuttonbar"><input type="submit" value="${n:i18n("REGISTER_SAVECHANGES")}">
       <span class="portlet-font"><a
-         href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">Cancel</a></span>
+         href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
    </td>
 </tr>
 </form>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp
===================================================================
(Binary files differ)

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp	2006-10-10 17:38:46 UTC (rev 5403)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp	2006-10-10 17:57:45 UTC (rev 5404)
@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
 <%@ page isELIgnored="false" %>
 
-<p>Search results for "${n:out("usernamefilter")}" (${n:out("results")} Matching Users)</p>
+<p>${n:i18n("LIST_SEARCHRESULTS")} "${n:out("usernamefilter")}" (${n:out("results")} ${n:i18n("LIST_MATCHING")})</p>
 
 <hr/>
 
@@ -77,69 +77,6 @@
    <input name="Find" type="submit" class="portlet-form-button" id="Find"
           value="${n:i18n("Search")}"/>
       <span class="portlet-font"><a
-         href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">Cancel</a></span>
+         href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
 </form>
-</div>
-
-<%--<form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
-   <table>
-      <tr class="portlet-section-header">
-         <th colspan="2">${n:i18n("LIST_FILTERS")}</th>
-      </tr>
-      <tr class="portlet-section-body">
-         <td>${n:i18n("LIST_USERSPERPAGE")}
-            <select name="usersperpage">
-               <option value="10">10</option>
-               <option value="20">20</option>
-               <option value="30">30</option>
-               <option value="50">50</option>
-               <option value="75">75</option>
-               <option value="100">100</option>
-            </select>
-         </td>
-         <td>${n:i18n("LIST_USERNAMECONTAINS")}
-            <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15"/>
-         </td>
-         <td>
-            <input type="submit" value="${n:i18n("FILTER")}"/>
-         </td>
-      </tr>
-   </table>
-</form>--%>
-
-<%--
-<n:if ctx="previouspage"><a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a></n:if>
-<n:if ctx="nextpage"><a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a></n:if>
---%>
-
-<%--
-<table>
-   <tr class="portlet-section-header">
-      <th>${n:i18n("LIST_FULLNAME")}</th>
-      <th>${n:i18n("LIST_USERNAME")}</th>
-      <th>${n:i18n("LIST_ROLES")}</th>
-      <th>${n:i18n("LIST_ACTIONS")}</th>
-   </tr>
-   <n:iterate ctx="row">
-      <tr class="portlet-section-body">
-         <td>${n:out("row.fullname0")}</td>
-         <td>${n:out("row.username0")}</td>
-         <td>
-            <n:iterate ctx="roles0">${n:out("row.roles0.name")}<br/></n:iterate>
-         </td>
-         <td><a href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
-            href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
-            href="${n:out("row.deleteURL0")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
-      </tr>
-      <tr class="portlet-section-alternate">
-         <td>${n:out("row.fullname1")}</td>
-         <td>${n:out("row.username1")}</td>
-         <td>
-            <n:iterate ctx="roles1">${n:out("row.roles1.name")}<br/></n:iterate>
-         </td>
-         <td><a href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
-            href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
-            href="${n:out("row.deleteURL1")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
-      </tr>
-   </n:iterate>
-</table>--%>
+</div>
\ No newline at end of file




More information about the jboss-svn-commits mailing list