[jboss-svn-commits] JBoss Portal SVN: r5401 - in trunk/core/src: bin/portal-core-war/images/user main/org/jboss/portal/core/portlet/user resources/portal-core-war/WEB-INF/jsp/user

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Oct 10 11:23:03 EDT 2006 

Author: roy.russo at jboss.com
Date: 2006-10-10 11:23:01 -0400 (Tue, 10 Oct 2006)
New Revision: 5401

Added:
   trunk/core/src/bin/portal-core-war/images/user/ico_adduser.gif
Modified:
   trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp
Log:
JBPORTAL-1073 - ui/functionality enhancements to userportlet.

Added: trunk/core/src/bin/portal-core-war/images/user/ico_adduser.gif
===================================================================
(Binary files differ)


Property changes on: trunk/core/src/bin/portal-core-war/images/user/ico_adduser.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java	2006-10-10 14:13:06 UTC (rev 5400)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java	2006-10-10 15:23:01 UTC (rev 5401)
@@ -51,6 +51,7 @@
 import javax.portlet.PortletSecurityException;
 import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
+import javax.portlet.WindowStateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashSet;
@@ -557,13 +558,14 @@
    /**
     *
     */
-   public void showListUsers(JBossActionRequest actionRequest, JBossActionResponse actionResponse) throws IOException
+   public void showListUsers(JBossActionRequest actionRequest, JBossActionResponse actionResponse) throws IOException, WindowStateException
    {
       if (actionRequest.isUserInRole("Admin"))
       {
          actionResponse.setRenderParameter("usernamefilter", actionRequest.getParameter("usernamefilter"));
          actionResponse.setRenderParameter("usersperpage", actionRequest.getParameter("usersperpage"));
          actionResponse.setRenderParameter("op", OP_SHOWLISTUSERS);
+         actionResponse.setWindowState(WindowState.MAXIMIZED);
       }
    }
 

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 14:13:06 UTC (rev 5400)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp	2006-10-10 15:23:01 UTC (rev 5401)
@@ -2,8 +2,6 @@
 <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
 <%@ page isELIgnored="false" %>
-<span class="portlet-font"><a
-        href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
 
 <p><span class="requiredfield">*</span>&nbsp;${n:i18n("REQUIRED")}</p>
 
@@ -13,75 +11,75 @@
 <form action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post">
 <input type="hidden" name="userid" value="${n:out("userid")}"/>
 <tr>
-    <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
+   <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td>
-    <td><input type="text" name="givenname" value="${n:out("GIVENNAME")}" size="30" maxlength="60"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td>
+   <td><input type="text" name="givenname" value="${n:out("GIVENNAME")}" size="30" maxlength="60"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td>
-    <td><input type="text" name="familyname" value="${n:out("FAMILYNAME")}" size="30" maxlength="60"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td>
+   <td><input type="text" name="familyname" value="${n:out("FAMILYNAME")}" size="30" maxlength="60"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span></td>
-    <td><input type="text" name="realemail" value="${n:out("REALEMAIL")}" size="30" maxlength="60">
-        <n:error key="realemail_error"/>
-    </td>
-    <td></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span></td>
+   <td><input type="text" name="realemail" value="${n:out("REALEMAIL")}" size="30" maxlength="60">
+      <n:error key="realemail_error"/>
+   </td>
+   <td></td>
 </tr>
 <tr>
-    <td>&nbsp;</td>
-    <td><span class="portlet-font">${n:i18n("REGISTER_EMAILNOTPUBLIC")}</span></td>
+   <td>&nbsp;</td>
+   <td><span class="portlet-font">${n:i18n("REGISTER_EMAILNOTPUBLIC")}</span></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td>
-    <td><input type="text" name="fakeemail" value="${n:out("FAKEEMAIL")}" size="30" maxlength="60">
-        <n:error key="fakeemail_error"/>
-    </td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td>
+   <td><input type="text" name="fakeemail" value="${n:out("FAKEEMAIL")}" size="30" maxlength="60">
+      <n:error key="fakeemail_error"/>
+   </td>
 </tr>
 <tr>
-    <td>&nbsp;</td>
-    <td><span class="portlet-font">${n:i18n("REGISTER_EMAILPUBLIC")}</span></td>
+   <td>&nbsp;</td>
+   <td><span class="portlet-font">${n:i18n("REGISTER_EMAILPUBLIC")}</span></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_VIEWREALEMAIL")}</td>
-    <td><input type="checkbox" name="viewrealemail" value="true" ${n:out("VIEWREALEMAIL")}/></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_VIEWREALEMAIL")}</td>
+   <td><input type="checkbox" name="viewrealemail" value="true" ${n:out("VIEWREALEMAIL")}/></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td>
-    <td><input type="text" name="homepage" value="${n:out("HOMEPAGE")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td>
+   <td><input type="text" name="homepage" value="${n:out("HOMEPAGE")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_LANGUAGE")}</td>
-    <td>
-        <select name="locale" class="pn-normal">
-            <n:iterate ctx="locale">
-                <option value="${n:out("locale.id")}" ${n:out("locale.selected")}>${n:out("locale.name")}</option>
-            </n:iterate>
-        </select>
-    </td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_LANGUAGE")}</td>
+   <td>
+      <select name="locale" class="pn-normal">
+         <n:iterate ctx="locale">
+            <option value="${n:out("locale.id")}" ${n:out("locale.selected")}>${n:out("locale.name")}</option>
+         </n:iterate>
+      </select>
+   </td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_TIMEZONEOFFSET")}</td>
-    <td>
-        <select name="timezoneoffset" class="pn-normal">
-            <n:iterate ctx="timezone">
-                <option value="${n:out("timezone.id")}" ${n:out("timezone.selected")}>${n:out("timezone.name")}</option>
-            </n:iterate>
-        </select>
-    </td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_TIMEZONEOFFSET")}</td>
+   <td>
+      <select name="timezoneoffset" class="pn-normal">
+         <n:iterate ctx="timezone">
+            <option value="${n:out("timezone.id")}" ${n:out("timezone.selected")}>${n:out("timezone.name")}</option>
+         </n:iterate>
+      </select>
+   </td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_THEME")}</td>
-    <td>
-        <select name="theme" class="pn-normal">
-            <option value="" selected>${n:i18n("REGISTER_DEFAULT_THEME")}</option>
-            <n:iterate ctx="theme">
-                <option value="${n:out("theme.id")}" ${n:out("theme.selected")}>${n:out("theme.id")}</option>
-            </n:iterate>
-        </select>
-    </td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_THEME")}</td>
+   <td>
+      <select name="theme" class="pn-normal">
+         <option value="" selected>${n:i18n("REGISTER_DEFAULT_THEME")}</option>
+         <n:iterate ctx="theme">
+            <option value="${n:out("theme.id")}" ${n:out("theme.selected")}>${n:out("theme.id")}</option>
+         </n:iterate>
+      </select>
+   </td>
 </tr>
 <%--tr>
    <td>${n:i18n("REGISTER_YOURAVATAR")}</td>
@@ -98,34 +96,34 @@
    </td>
 </tr--%>
 <tr>
-    <td colspan="3" nowrap><h4>${n:i18n("REGISTER_IM")}</h4></td>
+   <td colspan="3" nowrap><h4>${n:i18n("REGISTER_IM")}</h4></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_ICQ")}</td>
-    <td><input type="text" name="icq" value="${n:out("ICQ")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_ICQ")}</td>
+   <td><input type="text" name="icq" value="${n:out("ICQ")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_AIM")}</td>
-    <td><input type="text" name="aim" value="${n:out("AIM")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_AIM")}</td>
+   <td><input type="text" name="aim" value="${n:out("AIM")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_YIM")}</td>
-    <td><input type="text" name="yim" value="${n:out("YIM")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_YIM")}</td>
+   <td><input type="text" name="yim" value="${n:out("YIM")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_MSNM")}</td>
-    <td><input type="text" name="msnm" value="${n:out("MSNM")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_MSNM")}</td>
+   <td><input type="text" name="msnm" value="${n:out("MSNM")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_SKYPE")}</td>
-    <td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_SKYPE")}</td>
+   <td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td>
+   <td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td>
-    <td><input type="text" name="location" value="${n:out("LOCATION")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td>
+   <td><input type="text" name="location" value="${n:out("LOCATION")}" size="30" maxlength="100"></td>
 </tr>
 <!--tr>
             <td>${n:i18n("REGISTER_LANGUAGE")}</td>
@@ -134,50 +132,53 @@
             </td>
          </tr-->
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_OCCUPATION")}</td>
-    <td><input type="text" name="occupation" value="${n:out("OCCUPATION")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_OCCUPATION")}</td>
+   <td><input type="text" name="occupation" value="${n:out("OCCUPATION")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_INTERESTS")}</td>
-    <td><input type="text" name="interests" value="${n:out("INTERESTS")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_INTERESTS")}</td>
+   <td><input type="text" name="interests" value="${n:out("INTERESTS")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_SIGNATURE")}</td>
-    <td><textarea wrap="virtual" cols="50" rows="5" name="signature" class="pn-normal">${n:out("SIGNATURE")}</textarea>
-    </td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_SIGNATURE")}</td>
+   <td><textarea wrap="virtual" cols="50" rows="5" name="signature" class="pn-normal">${n:out("SIGNATURE")}</textarea>
+   </td>
 </tr>
 <tr>
-    <td>&nbsp;</td>
-    <td class="portlet-font">${n:i18n("255MAX")}</td>
+   <td>&nbsp;</td>
+   <td class="portlet-form-label">${n:i18n("255MAX")}</td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_EXTRAINFO")}</td>
-    <td><textarea wrap="virtual" cols="50" rows="5" name="extra" class="pn-normal">${n:out("EXTRA")}</textarea></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_EXTRAINFO")}</td>
+   <td><textarea wrap="virtual" cols="50" rows="5" name="extra" class="pn-normal">${n:out("EXTRA")}</textarea></td>
 </tr>
 <tr>
-    <td>&nbsp;</td>
-    <td class="portlet-font">${n:i18n("REGISTER_CANKNOWABOUT")}</td>
+   <td>&nbsp;</td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_CANKNOWABOUT")}</td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("PASSWORD")}</td>
-    <td><input type="password" name="pass1" size="10" maxlength="20">&nbsp;
-        <n:error key="pass1_error"/>
-        &nbsp;<input type="password" name="pass2" size="10" maxlength="20">&nbsp;<span
-            class="portlet-font">${n:i18n("REGISTER_PASSWORDAGAIN")}</span>
-        <n:error key="pass2_error"/>
-    </td>
+   <td class="portlet-form-label">${n:i18n("PASSWORD")}</td>
+   <td><input type="password" name="pass1" size="10" maxlength="20">&nbsp;
+      <n:error key="pass1_error"/>
+      &nbsp;<input type="password" name="pass2" size="10" maxlength="20">&nbsp;<span
+      class="portlet-form-label">${n:i18n("REGISTER_PASSWORDAGAIN")}</span>
+      <n:error key="pass2_error"/>
+   </td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_QUESTION")}</td>
-    <td class="pn-normal"><input type="text" name="question" value="${n:out("QUESTION")}" size="30" maxlength="100">
-    </td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_QUESTION")}</td>
+   <td class="pn-normal"><input type="text" name="question" value="${n:out("QUESTION")}" size="30" maxlength="100">
+   </td>
 </tr>
 <tr>
-    <td class="portlet-form-label">${n:i18n("REGISTER_ANSWER")}</td>
-    <td class="pn-normal"><input type="text" name="answer" value="${n:out("ANSWER")}" size="30" maxlength="100"></td>
+   <td class="portlet-form-label">${n:i18n("REGISTER_ANSWER")}</td>
+   <td class="pn-normal"><input type="text" name="answer" value="${n:out("ANSWER")}" size="30" maxlength="100"></td>
 </tr>
 <tr>
-    <td colspan="3" class="bottombuttonbar"><input type="submit" value="${n:i18n("REGISTER_SAVECHANGES")}"></td>
+   <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>
+   </td>
 </tr>
 </form>
 </table>
\ No newline at end of file

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 14:13:06 UTC (rev 5400)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp	2006-10-10 15:23:01 UTC (rev 5401)
@@ -5,6 +5,9 @@
 <span class="portlet-font"><a
       href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
 
+Search results for “<search parameters>” (<number of results> Matching Users)
+
+
 <form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
    <table>
       <tr class="portlet-section-header">

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

More information about the jboss-svn-commits mailing list