Author: emuckenhuber Date: 2007-11-30 11:51:47 -0500 (Fri, 30 Nov 2007) New Revision: 9225 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/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/roles/roleMembers.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/createUser.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/registerConfirm.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/noTabContainer.xhtml Log: - fixed the title in noTabContainer - added some headlines 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -23,6 +23,7 @@ </ui:define> <ui:define name="content"> + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3> <h:form> <h:selectManyCheckbox id="roles" value="#{assignrolemgr.roles}"> <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -23,7 +23,6 @@ </ui:define> <ui:define name="content"> - <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml"> <ui:param name="manager" value="#{editprofilemgr}"/> <ui:param name="adminMode" value="true"/> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -14,6 +14,7 @@ </ui:define> <ui:define name="content"> + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3> <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:form> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -19,6 +19,7 @@ </ui:define> <ui:define name="content"> +<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/></h3> <h:form> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -23,6 +23,7 @@ </ui:define> <ui:define name="content"> +<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/></h3> <h:form> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -23,7 +23,7 @@ </ui:define> <ui:define name="content"> - +<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/></h3> <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" styleClass="datatable" width="100%"> <h:column> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -14,7 +14,8 @@ </ui:define> <ui:define name="content"> - <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /></h3> + <h:messages id="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <br/> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -23,7 +23,7 @@ </li> </ui:define> <ui:define name="content"> -<br/> + <h3><h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /></h3> <h:form> <h:panelGrid columns="3" cellpadding="3"> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -24,7 +24,10 @@ </li> </ui:define> <ui:define name="content"> -<br/> +<h3> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" /> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" /> +</h3> <h:form> <h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%"> <h:column> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -19,7 +19,7 @@ </ui:define> <ui:define name="content"> - + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" /></h3> <ui:decorate template="/WEB-INF/jsf/common/register.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> </ui:decorate> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -39,7 +39,7 @@ // ]]> </script> </f:verbatim> -<br/> +<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /></h3> <h:form id="pending"> <h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%"> <h:column> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -19,6 +19,7 @@ </li> </ui:define> <ui:define name="content"> + <h3><h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /></h3> <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> <ui:param name="show_roles" value="true"/> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -24,6 +24,7 @@ <ui:define name="content"> <br/> + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3> <h:form> <h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}"> <f:selectItems value="#{identityrolemgr.roleSelectItems}" /> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -23,7 +23,7 @@ </ui:define> <ui:define name="content"> - + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" /></h3> <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> 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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -19,6 +19,7 @@ </ui:define> <ui:define name="content"> + <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3> <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-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -21,7 +21,7 @@ <c:if test="#{show_roles == true}"> <!-- assigned roles --> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_ASSIGNED}" /> - <h:dataTable id="roleslist" value="#{manager.roles}" var="role" styleClass="datatable"> + <h:dataTable id="roleslist" value="#{manager.roles}" var="role"> <h:column> <h:outputText value="#{role}"/> </h:column> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml 2007-11-30 16:12:30 UTC (rev 9224) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml 2007-11-30 16:51:47 UTC (rev 9225) @@ -4,6 +4,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <div class="no-tab-container"> + <ui:insert name="tab-object-path" /> <ui:insert name="tab-container-content"/> </div>