Author: emuckenhuber Date: 2007-09-18 07:57:22 -0400 (Tue, 18 Sep 2007) New Revision: 8314 Modified: trunk/core-identity/build.xml trunk/core-identity/src/bin/portal-identity-war/style.css trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml Log: - reset registration forms - mark required fields Modified: trunk/core-identity/build.xml =================================================================== --- trunk/core-identity/build.xml 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/build.xml 2007-09-18 11:57:22 UTC (rev 8314) @@ -324,8 +324,12 @@ <path refid="junit.junit.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jbossas/core.libs.classpath"/> + <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal-portlet.classpath"/> + <path refid="jboss.portal-identity.classpath"/> <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal-test.classpath"/> <path refid="oswego.concurrent.classpath" /> <path refid="apache.xerces.classpath"/> <pathelement location="${build.lib}/portal-core-identity-ui-lib.jar"/> Modified: trunk/core-identity/src/bin/portal-identity-war/style.css =================================================================== --- trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 11:57:22 UTC (rev 8314) @@ -49,7 +49,7 @@ .identity-ui ul.topnav { margin-left: 0; padding: 4px 0px 3px; - border-bottom: 1px solid #dfe8ed; + border-bottom: 1px solid #b3c0c7; } .identity-ui ul.topnav li { @@ -58,7 +58,7 @@ margin: 0; padding: 3px 0.5em; margin-left: 5px; - border: 1px solid #dfe8ed; + border: 1px solid #b3c0c7; border-bottom: none; background-color: #f2f4f5; } @@ -75,6 +75,7 @@ .identity-ui ul.topnav li#currentTab a:hover { } + /* Object path. */ .identity-ui ul.objectpath { Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-18 11:57:22 UTC (rev 8314) @@ -56,6 +56,9 @@ /** . */ private List roles = new ArrayList(); + + /** . */ + private List defaultRoles = null; /** . */ private IdentityUIUser uiUser = new IdentityUIUser(); @@ -95,6 +98,7 @@ public void setDefaultRoles(List roles) { this.roles = roles; + this.defaultRoles = roles; } public IdentityUserBean getIdentityUserBean() @@ -126,6 +130,13 @@ { this.metaDataService = metaDataService; } + + public String cancelRegistration() + { + this.uiUser = new IdentityUIUser(); + this.roles = defaultRoles; + return "start"; + } public void register(ActionEvent ev) { Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 11:57:22 UTC (rev 8314) @@ -34,7 +34,8 @@ IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirm Password IDENTITY_REGISTER_SUCCESS_TITLE=Your account has been successfully created. You may want to login now. -IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration. +IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration. +IDENTITY_REGISTER_REQUIRED_INFORMATION=indicates a required field. IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data? IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 11:57:22 UTC (rev 8314) @@ -29,7 +29,7 @@ </h:selectManyCheckbox> <hr/> <p style="text-align: right;"> - <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="#{userregistermgr.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/> </p> </h:form> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-18 11:57:22 UTC (rev 8314) @@ -10,7 +10,7 @@ <hr/> <h:graphicImage url="/jcaptcha" /> <h:panelGrid columns="2"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA}" /> + <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" /> <h:inputText id="validateCaptcha" value="" required="true"> <f:validator validatorId="CaptchaValidator" /> </h:inputText> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 11:57:22 UTC (rev 8314) @@ -30,7 +30,7 @@ <h:messages /> <hr/> <p style="text-align: right;"> - <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/> <h:commandButton id="#{subscriptionMode}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" actionListener="#{manager.register}" action="registered" styleClass="portlet-form-button"/> </p> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-18 11:30:28 UTC (rev 8313) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-18 11:57:22 UTC (rev 8314) @@ -8,27 +8,30 @@ <h:form> <h:panelGrid columns="2" cellpadding="3"> - <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> + <h:outputText value="#{bundle.IDENTITY_USERNAME} *"/> <h:inputText id="username" value="#{manager.uiUser.username}" required="true"> <f:validator validatorId="UsernameValidator"/> </h:inputText> <h:panelGroup /> <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <h:panelGroup> <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> + </h:panelGroup> <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> <f:validator validatorId="#{metadataservice.email.validator}"/> </h:inputText> <h:panelGroup /> <h:message for="#{metadataservice.email.name}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> + <h:outputText value="#{bundle.IDENTITY_PASSWORD} *"/> <h:inputSecret id="password" value="#{manager.uiUser.password}" required="true"> <f:validateLength minimum="6"/> </h:inputSecret> <h:panelGroup /> <h:message for="password" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/> + <h:outputText value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM} *"/> <h:inputSecret id="passwordCheck" required="true"> <f:validator validatorId="PasswordValidator"/> </h:inputSecret> @@ -42,9 +45,16 @@ <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> <hr/> - <p style="text-align: right;"> - <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/> -</p> + <table style="width: 100%"> + <tr> + <td style="text-align: left;"> + <h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" /> + </td> + <td style="text-align: right;"> + <h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + <h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/> + </td> + </tr> + </table> </h:form> </div> \ No newline at end of file