[jboss-svn-commits] JBoss Portal SVN: r5381 - 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
Mon Oct 9 16:35:54 EDT 2006 

Author: roy.russo at jboss.com
Date: 2006-10-09 16:35:52 -0400 (Mon, 09 Oct 2006)
New Revision: 5381

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/menu.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.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-09 20:25:00 UTC (rev 5380)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2006-10-09 20:35:52 UTC (rev 5381)
@@ -95,7 +95,6 @@
 EmailPublic=(This e-mail will be public. Type what you'd like. Spam proof)
 RealEmail=Real e-mail
 FakeEmail=Fake e-mail
-Required=(required)
 NewUser=New user
 SaveChanges=Save Changes
 SaveChange=Save Changes
@@ -141,7 +140,6 @@
 
 NotAuth=You\'re not authorized to perform this operation
 
-// Used by JBoss Portal
 
 REMEMBERME=Remember me
 LOGIN=Login
@@ -156,12 +154,15 @@
 
 NAMENOTAVAILABLE=N/A
 
-// Registration
+# Registration
 REGISER_NOT_LOGGED_IN=You are currently not logged in.
 REGISTER_REGISTER=You can create an account.
 REGISTER_REGISTER_LINK=create one
-REGISTER_REGISTER_ADMIN_LINK=Create new account
+REGISTER_REGISTER_ADMIN_LINK=Create User account
 REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
 REGISTER_NEWUSER=New user registration
 REGISTER_PASSWORDAGAIN=Confirm your password
 REGISTER_REALEMAIL=Real e-mail
@@ -214,7 +215,9 @@
 REGISTER_ERROR_PASSWORDMISMATCH=Passwords do not match
 REGISTER_ERROR_INVALIDREALEMAIL=Email address is not valid
 
+REGISTER_ADMIN_SEARCH=Use this form to view, edit or delete users.
 
+
 MENU_LOGOUT=Logout
 MENU_EDITPROFILE=Edit your profile
 MENU_LISTUSERS=List of all the users

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-09 20:25:00 UTC (rev 5380)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties	2006-10-09 20:35:52 UTC (rev 5381)
@@ -95,7 +95,6 @@
 EmailPublic=(This e-mail will be public. Type what you'd like. Spam proof)
 RealEmail=Real e-mail
 FakeEmail=Fake e-mail
-Required=(required)
 NewUser=New user
 SaveChanges=Save Changes
 SaveChange=Save Changes
@@ -141,8 +140,6 @@
 
 NotAuth=You\'re not authorized to perform this operation
 
-// Used by JBoss Portal
-
 REMEMBERME=Remember me
 LOGIN=Login
 USERNAME=Username
@@ -156,12 +153,15 @@
 
 NAMENOTAVAILABLE=N/A
 
-// Registration
+# Registration
 REGISER_NOT_LOGGED_IN=You are currently not logged in.
 REGISTER_REGISTER=You can create an account.
 REGISTER_REGISTER_LINK=create one
-REGISTER_REGISTER_ADMIN_LINK=Create new account
+REGISTER_REGISTER_ADMIN_LINK=Create User account
 REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
 REGISTER_NEWUSER=New user registration
 REGISTER_PASSWORDAGAIN=Confirm your password
 REGISTER_REALEMAIL=Real e-mail

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-09 20:25:00 UTC (rev 5380)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties	2006-10-09 20:35:52 UTC (rev 5381)
@@ -95,7 +95,6 @@
 EmailPublic=(Este correo será público. Escriba lo que quiera. Prueba de Spam)
 RealEmail=E-mail real
 FakeEmail=E-mail de pega
-Required=(obligatorio)
 NewUser=Nuevo usuario
 SaveChanges=Guardar cambios
 SaveChange=Guardar cambios
@@ -141,8 +140,6 @@
 
 NotAuth=Usted no está autorizado para realizar esta operación
 
-// Used by JBoss Portal
-
 REMEMBERME=Recordarme
 LOGIN=Login
 USERNAME=Usuario
@@ -156,12 +153,15 @@
 
 NAMENOTAVAILABLE=N/A
 
-// Registration
+# Registration
 REGISER_NOT_LOGGED_IN=You are currently not logged in.
 REGISTER_REGISTER=Puedes crear una cuenta.
 REGISTER_REGISTER_LINK=crear una
 REGISTER_REGISTER_ADMIN_LINK=Crear una cuenta
 REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
 REGISTER_NEWUSER=Registro de nuevo usuario
 REGISTER_PASSWORDAGAIN=Confirme su clave
 REGISTER_REALEMAIL=E-mail real
@@ -214,6 +214,7 @@
 REGISTER_ERROR_PASSWORDMISMATCH=Las Claves no coincide
 REGISTER_ERROR_INVALIDREALEMAIL=La dirección de E-mail no es válida
 
+REGISTER_ADMIN_SEARCH=Use this form to view, edit or delete users.
 
 MENU_LOGOUT=Desconectarse
 MENU_EDITPROFILE=Editar su perfil

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-09 20:25:00 UTC (rev 5380)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties	2006-10-09 20:35:52 UTC (rev 5381)
@@ -75,7 +75,7 @@
 TimeZoneOffset=Décalage GMT
 EmailNotPublic=(e-mail obligatoire mais non publié. Utilisé pour vous envoyer votre mot de passe)
 EmailPublic=(e-mail public.)
-Required=(obligatoire)
+#Required=Obligatoire
 SaveChanges=Enregistrer les modifications
 SaveChange=Enregistrer les modifications
 TypeNewPassword=(saisissez un nouveau mot de passe 2 fois pour valider)
@@ -120,8 +120,6 @@
 
 NotAuth=Opération non autorisée
 
-// Used by JBoss Portal
-
 REMEMBERME=Enregistrer
 LOGIN=Login 
 USERNAME=Identifiant
@@ -135,12 +133,15 @@
 
 NAMENOTAVAILABLE=N/D
 
-// Registration
+# Registration
 REGISER_NOT_LOGGED_IN=You are currently not logged in.
 REGISTER_REGISTER=Créer un compte
 REGISTER_REGISTER_LINK=Créer un compte
 REGISTER_REGISTER_ADMIN_LINK=Créer un compte
 REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
 REGISTER_NEWUSER=Enregistrement d'un nouvel utilisateur
 REGISTER_PASSWORDAGAIN=Comfirmer votre mot de passe
 REGISTER_REALEMAIL=e-mail réel
@@ -192,6 +193,7 @@
 REGISTER_ERROR_PASSWORDMISMATCH=les mots de passe sont differents
 REGISTER_ERROR_INVALIDREALEMAIL=Adresse email invalide
 
+REGISTER_ADMIN_SEARCH=Use this form to view, edit or delete users.
 
 MENU_LOGOUT=Deconnection
 MENU_EDITPROFILE=Editer votre profile

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-09 20:25:00 UTC (rev 5380)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp	2006-10-09 20:35:52 UTC (rev 5381)
@@ -1,161 +1,183 @@
 <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
 <%@ 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>
-<div class="box">
-   <table cellpadding="0" cellspacing="8" border="0" class="pn-normal">
-      <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 class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td>
-            <td><input type="text" name="givenname" value="${n:out("GIVENNAME")}" size="30" maxlength="60">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
-         </tr>
-         <tr>
-            <td class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}</td>
-            <td><input type="text" name="realemail" value="${n:out("REALEMAIL")}" size="30" maxlength="60">&nbsp;<span class="portlet-font">${n:i18n("REQUIRED")}</span> <n:error key="realemail_error"/></td>
-         <td></td>
-         </tr>
-         <tr>
-            <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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span> <n:error key="fakeemail_error"/></td>
-         </tr>
-         <tr>
-            <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>
-         </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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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>
-         </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>
-         </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>
-         </tr>
-         <%--tr>
-            <td>${n:i18n("REGISTER_YOURAVATAR")}</td>
-            <td>
-               <select name="avatar" class="pn-normal">${param["AVATARS"]}</select>
-               &nbsp;&nbsp;<img src="modules/user/images/avatars/{AVATAR}" name="avatar" width="32" height="32" alt="" align="top">
-            </td>
-         </tr>
-         <tr>
-            <td>${n:i18n("REGISTER_MESSAGEORDER")}</td>
-            <td class="pn-normal">
-               <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_1}" checked="checked"/>{ORDER_LABEL_1}</div>
-               <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_2}"/>{ORDER_LABEL_2}</div>
-            </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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
-         </tr>
-         <!--tr>
+<%@ 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>
+
+<hr/>
+
+<table cellpadding="0" cellspacing="8" border="0" class="pn-normal">
+<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>
+</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>
+</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>
+</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>
+</tr>
+<tr>
+    <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>
+</tr>
+<tr>
+    <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>
+</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>
+</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>
+</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>
+</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>
+</tr>
+<%--tr>
+   <td>${n:i18n("REGISTER_YOURAVATAR")}</td>
+   <td>
+      <select name="avatar" class="pn-normal">${param["AVATARS"]}</select>
+      &nbsp;&nbsp;<img src="modules/user/images/avatars/{AVATAR}" name="avatar" width="32" height="32" alt="" align="top">
+   </td>
+</tr>
+<tr>
+   <td>${n:i18n("REGISTER_MESSAGEORDER")}</td>
+   <td class="pn-normal">
+      <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_1}" checked="checked"/>{ORDER_LABEL_1}</div>
+      <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_2}"/>{ORDER_LABEL_2}</div>
+   </td>
+</tr--%>
+<tr>
+    <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>
+</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>
+</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>
+</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>
+</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>
+</tr>
+<tr>
+    <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>
+</tr>
+<!--tr>
             <td>${n:i18n("REGISTER_LANGUAGE")}</td>
             <td>
                <select name="language" class="pn-normal">${param["LANGUAGE"]}</select>
             </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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td class="portlet-font">${n:i18n("OPTIONAL")} - ${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>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td class="portlet-font">${n:i18n("OPTIONAL")} - ${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>
-         </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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></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">&nbsp;<span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
-         </tr>
-         <tr>
-            <td>&nbsp;</td>
-            <td><input type="submit" value="${n:i18n("REGISTER_SAVECHANGES")}"></td>
-         </tr>
-      </form>
-   </table>
-   <br/>
-</div>
+<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>
+</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>
+</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>
+</tr>
+<tr>
+    <td>&nbsp;</td>
+    <td class="portlet-font">${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>
+</tr>
+<tr>
+    <td>&nbsp;</td>
+    <td class="portlet-font">${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>
+</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>
+</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>
+</tr>
+<tr>
+    <td colspan="3" class="bottombuttonbar"><input type="submit" value="${n:i18n("REGISTER_SAVECHANGES")}"></td>
+</tr>
+</form>
+</table>
\ No newline at end of file

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

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp	2006-10-09 20:25:00 UTC (rev 5380)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp	2006-10-09 20:35:52 UTC (rev 5381)
@@ -4,13 +4,13 @@
 <%@ page isELIgnored="false" %>
 <portlet:defineObjects/>
 
-<p><span class="requiredfield">*</span> Required fields</p>
+<p><span class="requiredfield">*</span>&nbsp;${n:i18n("REQUIRED")}</p>
 <hr/>
 <table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal">
     <form name="register"
           action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
         <tr>
-            <td colspan="3" nowrap><h4>Basic User Information </h4></td>
+            <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
         </tr>
         <tr>
 
@@ -63,9 +63,7 @@
         <tr>
             <td colspan="3" class="bottombuttonbar">
                 <input name="register" type="submit" class="portlet-form-button"
-                       value="${n:i18n("REGISTER_NEWUSER")}"/>&nbsp;&nbsp;<input type="submit"
-                                                                                 value="Cancel"
-                                                                                 class="portlet-form-button">
+                       value="${n:i18n("REGISTER_NEWUSER")}"/>
             </td>
         </tr>
     </form>

More information about the jboss-svn-commits mailing list