[portal-commits] JBoss Portal SVN: r8349 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/ui/actions and 9 other directories.

Author: emuckenhuber Date: 2007-09-19 05:13:49 -0400 (Wed, 19 Sep 2007) New Revision: 8349 Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml Log: - minor ui improvements Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-19 09:13:49 UTC (rev 8349) @@ -87,6 +87,7 @@ // Loading workflow if subscriptionmodes != automatic if (this.configuration.enableWorkflow()) { + this.workflowService = this.getWorkflowService(); if (this.workflowService == null) throw new CoreIdentityConfigurationException("Workflowservice must not be null."); Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-19 09:13:49 UTC (rev 8349) @@ -184,14 +184,18 @@ */ this.uiUser = new IdentityUIUser(); - if (registrationStatus.equals(IdentityConstants.REGISTRATION_PENDING) ) + if (registrationStatus.equals(IdentityConstants.REGISTRATION_PENDING) && !adminSubscription.equals("admin")) { FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_REGISTER_PENDING_TITLE"))); } - else if (registrationStatus.equals(IdentityConstants.REGISTRATION_REGISTERED)) + else if (registrationStatus.equals(IdentityConstants.REGISTRATION_REGISTERED) && !adminSubscription.equals("admin")) { FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_REGISTER_SUCCESS_TITLE"))); } + else if (adminSubscription.equals("admin")) + { + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_CREATE_USER_CREATED"))); + } else { FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_REGISTRATION"))); Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-19 09:13:49 UTC (rev 8349) @@ -121,15 +121,6 @@ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot() .getLocale()); - // Used by the user management to reset passwords - if (username == null) - { - FacesContext ctx = FacesContext.getCurrentInstance(); - ExternalContext ectx = ctx.getExternalContext(); - Map params = ectx.getRequestParameterMap(); - this.username = (String) params.get("currentUser"); - } - if (username != null && username.trim().length() > 0) { try @@ -188,6 +179,15 @@ new FacesMessage(bundle.getString("IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL"))); return "status"; } + + public String adminResetPassword() + { + FacesContext ctx = FacesContext.getCurrentInstance(); + ExternalContext ectx = ctx.getExternalContext(); + Map params = ectx.getRequestParameterMap(); + this.username = (String) params.get("currentUser"); + return "resetPassword"; + } private String genPassword(int length) throws NoSuchAlgorithmException { Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-19 09:13:49 UTC (rev 8349) @@ -113,6 +113,10 @@ public DataModel getUserList() { + if ( this.userList == null) + { + this.searchUsers(); + } return userList; } @@ -336,16 +340,18 @@ public String confirmedDelete() { + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); try { User user = identityUserBean.findUserByUserName(this.uiUser.getUsername()); identityUserBean.getUserModule().removeUser(user.getId()); - return this.searchUsers(); + FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_USER_DELETED"))); + this.searchUsers(); + return "userAdmin"; } catch (Exception e) { log.error("unable delete user.", e); - ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER"))); } return "userAdmin"; Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-19 09:13:49 UTC (rev 8349) @@ -47,7 +47,7 @@ IDENTITY_EDIT_PASSWORD_TITLE=Change your password IDENTITY_EDIT_PASSWORD_CURRENT=Current password IDENTITY_EDIT_CHANGE_PASSWORD=Change password -IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user: +IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password. IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated. @@ -103,6 +103,8 @@ IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Role Management IDENTITY_MANAGEMENT_SEARCH_USER=Search users IDENTITY_MANAGEMENT_CREATE_USER=Create new user account +IDENTITY_MANAGEMENT_CREATE_USER_CREATED=User created +IDENTITY_MANAGEMENT_USER_DELETED=User deleted IDENTITY_MANAGEMENT_ROLE=Role IDENTITY_MANAGEMENT_ROLE_DISPLAY=Display name IDENTITY_MANAGEMENT_ROLE_MEMBERS=Members @@ -113,7 +115,7 @@ IDENTITY_MANAGEMENT_DISABLE=Disable IDENTITY_MANAGEMENT_ENABLE=Enable IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password -IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user: +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password of user IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email. IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user: IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users @@ -122,6 +124,8 @@ IDENTITY_MANAGEMENT_REJECT_ALL=Reject selected IDENTITY_MANAGEMENT_SELECT_ALL=select all IDENTITY_MANAGEMENT_UNSELECT_ALL=unselect all +IDENTITY_MANAGEMENT_MATRIX=Matrix +IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Subscription Modes IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -26,8 +26,8 @@ </h:selectManyCheckbox> <hr/> <p style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -13,10 +13,6 @@ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="pathItem"> - <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> </li> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -17,20 +17,21 @@ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:form> - <ul> - <li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"/></li> + <h:panelGrid> + <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers" + styleClass="actionDetails"/> <c:if test="#{useradministrationbean.pendingCount > 0}"> - <li><h:commandLink value="Show pending registrations" action="showPendingUsers"/></li> + <h:commandLink value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/> </c:if> - <li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser"/></li> - </ul> + <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/> + </h:panelGrid> </h:form> <table style="width: 100%;"> <tr> - <td colspan="2"><h3 class="sectionTitle">statistics</h3></td> + <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></h3></td> </tr> <tr> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td> @@ -45,7 +46,7 @@ </tr> </c:if> <tr> - <td colspan="2"><h3 class="sectionTitle">subscription modes</h3></td> + <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></h3></td> </tr> <tr> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -29,8 +29,8 @@ </h:panelGrid> <hr/> <p style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -29,8 +29,8 @@ </h:panelGrid> <hr/> <p style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -54,7 +54,7 @@ <hr/> <h:form> - <p style="text-align: right"><h:commandLink value="Create new role" action="createRole"/></p> + <p style="text-align: right"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> </h:form> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -23,6 +23,10 @@ <br/> <h:form> <h:panelGrid columns="3" cellpadding="3"> + + <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> + <h:outputText id="username" value="#{editprofilemgr.currentUser}" /> + <h:message for="username"/> <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> <h:inputSecret id="password" required="true" value="#{editprofilemgr.password}"> @@ -39,8 +43,8 @@ <hr/> <p style="text-align: right;"> + <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> </p> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -58,10 +58,10 @@ </h:column> </h:dataTable> <br/> - <p style="text-align: right;"> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/> + <p style="text-align: right;"> <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" /> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -82,7 +82,7 @@ <f:param name="action" value="approve" /> </h:commandLink> <h:outputText value=" | " rendered="#{user.currentNode == 'admin_approval'}" /> - <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionMakeDefault"> + <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDelete"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/> <f:param name="processId" value="#{user.processId}" /> <f:param name="action" value="reject" /> @@ -96,10 +96,10 @@ <a href="#" onClick="selectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SELECT_ALL}" /></a> | <a href="#" onClick="unSelectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_UNSELECT_ALL}" /></a> </td> - <td style="text-align: right;"> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/> + <td style="text-align: right;"> <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/> </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -27,8 +27,8 @@ </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 value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="#{userregistermgr.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -15,21 +15,32 @@ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " /> - <h:outoutText value="#{editprofilemgr.uiUser.username}" /> + <h:outputText value="#{lostpasswordmgr.username}" /> </li> </ui:define> <ui:define name="content"> + + <div class="portlet-msg"> + <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> + <div class="portlet-msg-body"> + <h3> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " /> + <h:outputText value="#{lostpasswordmgr.username}" /> + </h3> + <p class="portlet-msg-alert"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" /> + </p> <h:form> - <p><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" /></p> - <hr/> - <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandLink action="#{lostpasswordmgr.doomed}"> - <h:outputText value="#{bundle.IDENTITY_BUTTON_SUBMIT}" /> - <f:param name="currentUser" value="#{editprofilemgr.uiUser.username}" /> - </h:commandLink> - + <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" + styleClass="portlet-form-button portlet-section-buttonrow" /> + + <h:commandButton action="#{lostpasswordmgr.doomed}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" + styleClass="portlet-form-button portlet-section-buttonrow" /> </h:form> +</div> +</div> + </ui:define> </ui:composition> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -19,7 +19,6 @@ </ui:define> <ui:define name="content"> - <br/> <h:form> <h:panelGrid columns="4"> <h:inputText id="searchString" value="#{useradministrationbean.searchString}" /> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -30,9 +30,9 @@ <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 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"/> + <h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> </p> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -149,8 +149,8 @@ <hr/> <p style="text-align: right;"> + <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> </p> </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -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="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/> + <h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> + </td> + </tr> + </table> </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -45,7 +45,7 @@ <c:choose> <c:when test="#{portletPreferenceValue.resetPassword == true}"> <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> - <h:commandLink action="resetPassword"> + <h:commandLink action="#{lostpasswordmgr.adminResetPassword}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" /> <f:param name="currentUser" value="#{manager.uiUser.username}" /> </h:commandLink> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -26,8 +26,8 @@ <hr/> <p style="text-align: right;"> + <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{lostpasswordmgr.doomed}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{lostpasswordmgr.doomed}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -37,8 +37,8 @@ </h:panelGrid> <hr/> <p style="text-align: right;"> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-19 09:13:49 UTC (rev 8349) @@ -45,8 +45,8 @@ <hr/> <p style="text-align: right;"> + <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/> - <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-19 09:02:51 UTC (rev 8348) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-19 09:13:49 UTC (rev 8349) @@ -92,7 +92,7 @@ requires correct mail service configuration --> <name>resetPassword</name> - <value>false</value> + <value>true</value> </preference> </portlet-preferences> </portlet>