[portal-commits] JBoss Portal SVN: r8342 - in trunk/core-identity/src: bin/portal-identity-war/img and 12 other directories.

Author: emuckenhuber Date: 2007-09-18 18:43:11 -0400 (Tue, 18 Sep 2007) New Revision: 8342 Added: trunk/core-identity/src/bin/portal-identity-war/img/ trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png Modified: trunk/core-identity/src/bin/portal-identity-war/style.css trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 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/resetPassword.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml Log: - updated UI regarding core-admin css changes Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png =================================================================== (Binary files differ) Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/core-identity/src/bin/portal-identity-war/style.css =================================================================== --- trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 22:43:11 UTC (rev 8342) @@ -1,5 +1,15 @@ /* Redefine spacing for tables. */ +a { + color: #446688; + text-decoration: none; +} + +a:hover { + color: #5078aa; + text-decoration: underline; +} + .identity-ui table { border: 0; } @@ -30,14 +40,12 @@ list-style-type: none; display: inline; margin-right: 2px; - border: 1px solid; } .identity-ui ul.pagination li.selected { font-weight: bold; background-color: #eef; - border: 1px solid black; - border-bottom: 3px solid black; + border-bottom: 2px solid #656565; } .pagination a, .pagination a:visited, .pagination a:hover { @@ -75,24 +83,62 @@ .identity-ui ul.topnav li#currentTab a:hover { } - /* Object path. */ .identity-ui ul.objectpath { - margin: 0; - padding: 5px 0px 5px 0px; + list-style-type: none; + font-size: 11px; + border: solid 1px #bbb; + border-left: solid 1px #eee; + border-right: solid 1px #eee; + background-color: #d5d5d5; + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + height: 21px; + margin: 0px; + padding: 0px; + padding-left: 2px; } .identity-ui ul.objectpath li { list-style-type: none; - display: inline; - margin-right: 3px; + display: block; + float: left; } +.identity-ui ul li.pathItem { + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; +} + +/* +.identity-ui ul.li.pathSeparator { + background-image: url(img/pathSeparator.png); + background-position: center center; + background-repeat: no-repeat; + width: 7px; +} +*/ + .identity-ui ul.objectpath li.selected { font-weight: bold; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; } +.identity-ui ul.objectpath a { + color: #333333; + text-decoration: none; +} + +.identity-ui ul.objectpath a:hover { + color: #5078aa; + text-decoration: none; +} + /* Resize combo lists */ .identity-ui select { padding: 2px 4px 2px 1px; @@ -141,7 +187,7 @@ .identity-ui .portlet-area-body { border: 1px solid #d5d5d5; - border-top: 0; + border-top: 0px; background-color: #fff; padding: 4px; margin: 0; @@ -158,6 +204,170 @@ padding-left: 6px; } +.identity-ui h3.sectionTitle { + font-weight: bold; + color: #656565; + font-size: 11px; + border-top: 1px solid #999; + background-color: #ebf2f5; + padding: 2px; + padding-left: 4px; +} + +.identity-ui .portlet-section-header { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.identity-ui .portlet-section-header th { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.identity-ui .portlet-section-body { + color: #656565; + border: 1px solid #d5d5d5; + border-top: 0px; +} + +.identity-ui .portlet-section-alternate { + background-color: #F2F2F2; + border: 1px solid #d5d5d5; +} + +.identity-ui .portlet-section-selected { + background-color: #CBD4E6; +} + +.identity-ui .actionDetails { + background-image: url( img/actionIcon_Details.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionLayout { + background-image: url( img/actionIcon_Layout.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionSecurity { + background-image: url( img/actionIcon_Security.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionProperties { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 18px; + white-space: nowrap; + height: 22px; +} + +.identity-ui .actionTheme { + background-image: url( img/actionIcon_Theme.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionRename { + background-image: url( img/actionIcon_Rename.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionDelete { + background-image: url( img/actionIcon_Delete.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionMakeDefault { + background-image: url( img/actionIcon_MakeDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionDefault { + background-image: url( img/actionIcon_IsDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionPreferences { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.identity-ui .actionCreateInstance { + background-image: url( img/actionIcon_CreateInstance.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + .identity-ui .portlet-content-center { padding: 0; margin: 0; @@ -212,6 +422,11 @@ clear: both; } +.identity-ui form { + padding: 0; + margin: 0; +} + .identity-ui #selected.wizardStepBox { background-color: #C8DCC4; border: 1px solid black; @@ -234,3 +449,40 @@ margin: 2px; padding: 2px; } + +.identity-ui .createObjectForm { + display: block; + padding: 1em 0 0 0; +} + +.identity-ui .objectList { + width: 100%; +} + +.identity-ui .objectList .objectNameColumn { + width: 25%; +} + +.identity-ui .objectList .objectActionColumn { + width: 75%; +} + +.identity-ui .portlet-msg { + border: 1px solid #bbb; + margin: 2em auto; + padding: 1em; + width: 60%; +} + +.identity-ui .portlet-msg-body { + position: relative; + top: -3em; + left: 3em; + width: 95%; +} + +.identity-label { + padding: 0 4px 3px 0; + display: inline-block; + vertical-align: middle; +} Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-18 22:43:11 UTC (rev 8342) @@ -88,12 +88,13 @@ if (this.configuration.enableWorkflow()) { this.workflowService = this.getWorkflowService(); + if (this.workflowService == null) + throw new CoreIdentityConfigurationException("Workflowservice must not be null."); String subscriptionMode = this.configuration.getSubscriptionMode(); String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode(); String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name; - if ( workflowService != null - && subscriptionMode != null + if ( subscriptionMode != null && adminSubscriptionMode != null && emailValidationProcess != null) { @@ -106,7 +107,7 @@ } else { - throw new CoreIdentityConfigurationException("WorkflowService or processName must not be null."); + throw new CoreIdentityConfigurationException("processName must not be null."); } } else Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-18 22:43:11 UTC (rev 8342) @@ -208,8 +208,6 @@ String hash = (String) processInstance.getContextInstance().getVariable(IdentityConstants.VALIDATION_HASH); if (registrationHash.equals(hash) && ! processInstance.hasEnded()) { - String action = (String) processInstance.getContextInstance().getVariable(IdentityConstants.ACTION); - token.signal(IdentityConstants.JBPM_TRANSITION_VALIDATED); success = processInstance.getProcessDefinition().getName(); } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-18 22:43:11 UTC (rev 8342) @@ -27,12 +27,15 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.ResourceBundle; import java.util.Set; +import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.model.ListDataModel; +import org.jboss.logging.Logger; import org.jboss.portal.core.identity.ui.IdentityUIUser; import org.jboss.portal.core.identity.ui.UIRole; import org.jboss.portal.core.identity.ui.common.IdentityRoleBean; @@ -66,6 +69,9 @@ /** . */ private IdentityRoleBean identityRoleBean; + + /** The logger */ + private static final Logger log = Logger.getLogger(RoleManagementBean.class); public IdentityRoleBean getIdentityRoleBean() { @@ -127,8 +133,7 @@ } catch (IdentityException e) { - // FIXME - e.printStackTrace(); + log.error("", e); } Iterator i = set.iterator(); while (i.hasNext()) @@ -153,8 +158,10 @@ } catch ( Exception e) { - e.printStackTrace(); - // FacesMessage + log.error("", e); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); + ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE"))); + return "roleAdmin"; } return "viewMembers"; } @@ -163,6 +170,7 @@ { Set members = new HashSet(); List roleMembers = new ArrayList(); + FacesContext ctx = FacesContext.getCurrentInstance(); try { int intLimit = Integer.valueOf(limit).intValue(); @@ -172,7 +180,9 @@ } catch (Exception e) { - e.printStackTrace(); + log.error("", e); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); + ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE"))); } Iterator i = members.iterator(); while (i.hasNext()) @@ -184,7 +194,9 @@ } catch (Exception e) { - e.printStackTrace(); + log.error("", e); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); + ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER"))); } } return new ListDataModel(roleMembers); @@ -205,8 +217,10 @@ } catch (Exception e) { - e.printStackTrace(); - // FacesMessage + log.error("", e); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); + ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE"))); + return "roleAdmin"; } } @@ -224,7 +238,10 @@ } catch (Exception e) { - e.printStackTrace(); + log.error("", e); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); + FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE"))); + return "roleAdmin"; } return "roleAdmin"; } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-18 22:43:11 UTC (rev 8342) @@ -27,12 +27,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.ResourceBundle; +import javax.faces.application.FacesMessage; +import javax.faces.application.FacesMessage.Severity; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.model.DataModel; import javax.faces.model.ListDataModel; -import javax.portlet.PortletException; import org.jboss.logging.Logger; import org.jboss.portal.core.identity.services.IdentityConstants; @@ -41,8 +43,6 @@ import org.jboss.portal.core.identity.ui.IdentityUIUser; import org.jboss.portal.core.identity.ui.common.IdentityRoleBean; import org.jboss.portal.core.identity.ui.common.IdentityUserBean; -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.User; /** @@ -74,6 +74,12 @@ private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL; /** . */ + private String subscriptionMode; + + /** . */ + private String adminSubscriptionMode; + + /** . */ private List pendingUsers = null; /** . */ @@ -159,7 +165,27 @@ { this.uiUser = uiUser; } - + + public String getSubscriptionMode() + { + return subscriptionMode; + } + + public void setSubscriptionMode(String subscriptionMode) + { + this.subscriptionMode = subscriptionMode; + } + + public String getAdminSubscriptionMode() + { + return adminSubscriptionMode; + } + + public void setAdminSubscriptionMode(String adminSubscriptionMode) + { + this.adminSubscriptionMode = adminSubscriptionMode; + } + public IdentityUserBean getIdentityUserBean() { return identityUserBean; @@ -211,21 +237,12 @@ int limit1 = intLimit + 1; this.userList = new ListDataModel(identityUserBean.findUsersFilteredByUserName(searchString, offset, limit1)); } - catch (IllegalArgumentException e) + catch (Exception e) { - // FIXME - e.printStackTrace(); + log.error("",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"))); } - catch (NoSuchUserException e) - { - // FIXME - e.printStackTrace(); - } - catch (IdentityException e) - { - // FIXME - e.printStackTrace(); - } } return "searchUsers"; } @@ -262,9 +279,12 @@ catch (Exception e) { log.error("unable to get user: " + this.currentUser, e); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); + ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER"))); return "userAdmin"; } // Updating search + ctx.addMessage("status", new FacesMessage("user enabled")); return this.searchUsers(); } return "searchUsers"; @@ -286,6 +306,8 @@ catch (Exception e) { log.error("", 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 userCount; @@ -323,6 +345,8 @@ 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: 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 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 22:43:11 UTC (rev 8342) @@ -129,14 +129,26 @@ IDENTITY_MANAGEMENT_PENDING_APPROVE=approve IDENTITY_MANAGEMENT_PENDING_REJECT=reject +IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Subscription mode +IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Admin subscription mode +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Custom subscription mode. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatic - no e-mail validation, no admin approval. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=E-Mail validation, no admin approval. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN= E-Mail validation and admin approval. + IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha -IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete +IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete +IDENTITY_WARNING_CONFIRM_DELETE_USER=Warning! You are about to delete the user +IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Warning! You are about to delete the role IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address +IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=Unable to perform action on role. Please take a look at the logfile for further information. +IDENTITY_MANAGEMENT_ERROR_ACTION_USER=Unable to perform action on user. Please take a look at the logfile for further information. + IDENTITY_VERIFICATION_RETURN=Return to portal IDENTITY_VERIFICATION_LOGIN=Login IDENTITY_VERIFICATION_STATUS_FAILED=Can not validate the e-mail address. Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-18 22:43:11 UTC (rev 8342) @@ -117,6 +117,14 @@ <managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> + <property-name>subscriptionMode</property-name> + <value>#{applicationScope.IdentityUIConfigurationService.configuration.subscriptionMode}</value> + </managed-property> + <managed-property> + <property-name>adminSubscriptionMode</property-name> + <value>#{applicationScope.IdentityUIConfigurationService.configuration.adminSubscriptionMode}</value> + </managed-property> + <managed-property> <property-name>identityUserBean</property-name> <value>#{identityusermgr}</value> </managed-property> @@ -305,7 +313,7 @@ </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> + <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> <navigation-case> <from-outcome>searchUsers</from-outcome> <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,17 +9,14 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> - <h:outputText value="#{assignrolemgr.uiUser.username}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> + <h:outputText value="#{assignrolemgr.uiUser.username}" /> + </li> </ui:define> <ui:define name="content"> @@ -29,7 +26,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="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> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,19 +9,17 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <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> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -8,14 +8,14 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - <ul class="objectpath"> - <li> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - </ul> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> </ui:define> <ui:define name="content"> + <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> @@ -27,16 +27,66 @@ <li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser"/></li> </ul> </h:form> - <hr/> - <h:panelGrid columns="2"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/> - <h:outputText value="#{useradministrationbean.userCount}" /> - <c:if test="#{useradministrationbean.pendingCount > 0}"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /> - <h:outputText value="#{useradministrationbean.pendingCount}" /> - </c:if> - </h:panelGrid> + <table style="width: 100%;"> + <tr> + <td colspan="2"><h3 class="sectionTitle">statistics</h3></td> + </tr> + <tr> + <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td> + <td> + <h:outputText value="#{useradministrationbean.userCount}" /> + </td> + </tr> + <c:if test="#{useradministrationbean.pendingCount > 0}"> + <tr> + <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td> + <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td> + </tr> + </c:if> + <tr> + <td colspan="2"><h3 class="sectionTitle">subscription modes</h3></td> + </tr> + <tr> + <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td> + <td> + <c:choose> + <c:when test="#{useradministrationbean.subscriptionMode == 'automatic'}"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" /> + </c:when> + <c:when test="#{useradministrationbean.subscriptionMode == 'jbp_identity_validation_approval_workflow'}"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}" /> + </c:when> + <c:when test="#{useradministrationbean.subscriptionMode == 'jbp_identity_validation_workflow'}"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" /> + </c:when> + <c:otherwise> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td> + <td> + <c:choose> + <c:when test="#{useradministrationbean.adminSubscriptionMode == 'automatic'}"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" /> + </c:when> + <c:when test="#{useradministrationbean.adminSubscriptionMode == 'jbp_identity_validation_approval_workflow'}"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}" /> + </c:when> + <c:when test="#{useradministrationbean.adminSubscriptionMode == 'jbp_identity_validation_workflow'}"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" /> + </c:when> + <c:otherwise> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + </table> + </ui:define> </ui:composition> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,16 +9,13 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/> + </li> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -10,35 +10,39 @@ <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> - <h:outputText value="#{rolemanagementbean.uiRole.name}"/> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="pathItem"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> + </li> + <li class="selected"> + <h:outputText value="#{rolemanagementbean.uiRole.name}"/> + </li> </ui:define> <ui:define name="content"> - -<h:form> - <h:panelGrid columns="2"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/> - <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/> - - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/> - <h:outputText id="displayName" value="#{rolemanagementbean.uiRole.displayName}"/> - </h:panelGrid> - <h:messages /> - <hr/> - <p style="text-align: right;"> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" styleClass="portlet-form-button"/> - </p> -</h:form> + <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_ACTION_DELETE}" /> + <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/> + <h:outputText value="(#{rolemanagementbean.uiRole.displayName})" /> + </h3> + <p class="portlet-msg-alert"> + #{bundle.IDENTITY_WARNING_CONFIRM_DELETE_ROLE} + #{rolemanagementbean.uiRole.name} + </p> + <h:form> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" + styleClass="portlet-form-button portlet-section-buttonrow" /> + + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" + styleClass="portlet-form-button portlet-section-buttonrow" /> + </h:form> +</div> +</div> </ui:define> </ui:composition> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,16 +9,13 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/> + </li> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,20 +9,21 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="pathItem"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{rolemanagementbean.uiRole.name}"/> + </li> </ui:define> <ui:define name="content"> -<hr/> + <h:form> <h:dataTable value="#{rolemanagementbean.roleMembers}" var="uiUser" rows="#{rolemanagementbean.limit}" rendered="#{rolemanagementbean.roleMembers.rowCount > 0}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> <h:column> @@ -53,11 +54,11 @@ <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> - <h:commandLink action="#{editprofilemgr.adminEditProfile}"> + <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> | - <h:commandLink action="#{assignrolemgr.assignRoles}"> + <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionDelete"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> @@ -67,6 +68,7 @@ <h:commandLink value=" &#60; " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/> <h:commandLink value=" &#62; " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/> <br/> +<hr/> <h:form> <h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4> <h:panelGrid columns="3"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -18,8 +18,13 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <h:form> + <ul class="objectpath"> + <ui:insert name="title">Title</ui:insert> + </ul> + </h:form> + + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -8,14 +8,16 @@ <ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> - <ul class="objectpath"> - <li> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> - </li> - </ul> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> + </li> </ui:define> <ui:define name="content"> + <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <br/> + <h:form> <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> <h:column> @@ -35,14 +37,14 @@ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> <h:commandLink action="#{editrolemgr.editRole}"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/> <f:param name="currentRole" value="#{role.name}"/> </h:commandLink> - | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}"> + | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/> <f:param name="currentRole" value="#{role.name}"/> </h:commandLink> - | <h:commandLink action="#{rolemanagementbean.deleteRole}"> + | <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/> <f:param name="currentRole" value="#{role.name}"/> </h:commandLink> @@ -50,6 +52,7 @@ </h:dataTable> </h:form> + <hr/> <h:form> <p style="text-align: right"><h:commandLink value="Create new role" action="createRole"/></p> </h:form> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -10,20 +10,17 @@ <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" /> - <h:outputText value="#{editprofilemgr.currentUser}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" /> + <h:outputText value="#{editprofilemgr.currentUser}" /> + </li> </ui:define> <ui:define name="content"> - +<br/> <h:form> <h:panelGrid columns="3" cellpadding="3"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,20 +9,22 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" /> - </li> - </ul> -</h:form> + + <li class="pathItem"> + <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="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" /> + </li> </ui:define> <ui:define name="content"> +<br/> <h:form> <h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> <h:column> @@ -55,6 +57,7 @@ </h:outputText> </h:column> </h:dataTable> +<br/> <p style="text-align: right;"> <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,16 +9,13 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> + </li> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -10,35 +10,39 @@ <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> - <h:outputText value="#{useradministrationbean.uiUser.username}"/> - </li> - </ul> -</h:form> + <li class="pathItem"> + <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:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> + </li> + <li class="selected"> + <h:outputText value="#{useradministrationbean.uiUser.username}"/> + </li> </ui:define> <ui:define name="content"> - -<h:form> - <h:panelGrid columns="2"> - <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/> - <h:outputText id="username" value="#{useradministrationbean.uiUser.username}"/> - - <h:outputText for="email" value="#{bundle.IDENTITY_EMAIL}"/> - <h:outputText id="email" value="#{useradministrationbean.uiUser.attribute.email}"/> - </h:panelGrid> - <h:messages /> - <hr/> - <p style="text-align: right;"> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/> - </p> -</h:form> + <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_ACTION_DELETE}" /> + <h:outputText value="#{useradministrationbean.uiUser.username}" /> + <h:outputText value="(#{useradministrationbean.uiUser.attribute.email})" /> + </h3> + <p class="portlet-msg-alert"> + #{bundle.IDENTITY_WARNING_CONFIRM_DELETE_USER} + #{useradministrationbean.uiUser.username} + </p> + <h:form> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers" + styleClass="portlet-form-button portlet-section-buttonrow" /> + + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" + styleClass="portlet-form-button portlet-section-buttonrow" /> + </h:form> +</div> +</div> </ui:define> </ui:composition> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,16 +9,13 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /> + </li> </ui:define> <ui:define name="content"> @@ -42,6 +39,7 @@ // ]]> </script> </f:verbatim> +<br/> <h:form id="pending"> <h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> <h:column> @@ -78,19 +76,20 @@ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> <h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/> - <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}"> + <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/> <f:param name="processId" value="#{user.processId}" /> <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'}"> + <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionMakeDefault"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/> <f:param name="processId" value="#{user.processId}" /> <f:param name="action" value="reject" /> </h:commandLink> </h:column> </h:dataTable> +<br/> <table border="0" cellspacing="3" style="width: 100%;" > <tr> <td style="text-align: left;" > Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -10,16 +10,13 @@ <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> + </li> </ui:define> <ui:define name="content"> <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> 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 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,20 +9,18 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> - <h:outputText value="#{userregistermgr.uiUser.username}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> + <h:outputText value="#{userregistermgr.uiUser.username}" /> + </li> </ui:define> <ui:define name="content"> +<br/> <h:form> <h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}"> <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,17 +9,14 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " /> - <h:outoutText value="#{editprofilemgr.uiUser.username}" /> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <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}" /> + </li> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,18 +9,17 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> -<h:form> - <ul class="objectpath"> - <li> - <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> - </li> - <li> - &gt; <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> - </li> - </ul> -</h:form> + <li class="pathItem"> + <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/> + </li> </ui:define> + <ui:define name="content"> + <br/> <h:form> <h:panelGrid columns="4"> <h:inputText id="searchString" value="#{useradministrationbean.searchString}" /> @@ -35,7 +34,7 @@ <h:message for="limit" /> </h:panelGrid> </h:form> - <hr/> + <br/> <h:form> <h:dataTable id="userlist" value="#{useradministrationbean.userList}" var="uiUser" rendered="#{useradministrationbean.userList.rowCount > 0}" rows="#{useradministrationbean.limit}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%"> <h:column> @@ -74,20 +73,20 @@ <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> - <h:commandLink action="#{editprofilemgr.adminEditProfile}"> + <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> | - <h:commandLink action="#{assignrolemgr.assignRoles}"> + <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionProperties"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> | - <h:commandLink action="#{useradministrationbean.enableUser}"> + <h:commandLink action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}"> <h:outputText value="#{uiUser.attribute.enabled == true ? bundle.IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" /> <f:param name="currentUser" value="#{uiUser.username}"/> <f:param name="enableAction" value="#{uiUser.attribute.enabled == true ? 'disable' : 'enable'}" /> </h:commandLink> | - <h:commandLink action="#{useradministrationbean.deleteUser}"> + <h:commandLink action="#{useradministrationbean.deleteUser}" styleClass="actionDelete"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -18,8 +18,12 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <h:form> + <ul class="objectpath"> + <ui:insert name="title"><li>Title</li></ui:insert> + </ul> + </h:form> + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -23,8 +23,12 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <ul class="objectpath"> + <li class="selected"> + <ui:insert name="title">Title</ui:insert> + </li> + </ul> + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,7 +9,13 @@ <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/> + <li class="pathItem"> + <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/> + </li> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -9,7 +9,13 @@ <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> - <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}" /> + <li class="pathItem"> + <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}"/> + </li> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -10,7 +10,11 @@ <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> -<ui:define name="title" /> +<ui:define name="title"> + <li class="selected"> + <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> + </li> +</ui:define> <ui:define name="content"> <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -18,8 +18,12 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <h:form> + <ul class="objectpath"> + <ui:insert name="title">Title</ui:insert> + </ul> + </h:form> + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -18,8 +18,12 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <ul class="objectpath"> + <li class="selected"> + <ui:insert name="title">Title</ui:insert> + </li> + </ul> + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -13,7 +13,7 @@ </ui:define> <ui:define name="content"> <h:form> - <p><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p> + <p style="text-align:center;"><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p> </h:form> </ui:define> </ui:composition> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -26,8 +26,12 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <ul class="objectpath"> + <li class="selected"> + <ui:insert name="title">Title</ui:insert> + </li> + </ul> + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342) @@ -26,8 +26,12 @@ </h:form> <!-- Title --> - <h4><ui:insert name="title">Title</ui:insert></h4> - + <ul class="objectpath"> + <li class="selected"> + <ui:insert name="title">Title</ui:insert> + </li> + </ul> + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> </div> \ No newline at end of file