Author: emuckenhuber Date: 2007-09-19 12:49:45 -0400 (Wed, 19 Sep 2007) New Revision: 8369 Modified: trunk/core-identity/src/bin/portal-identity-war/style.css 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/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/pendingUsers.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/common/captcha.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml Log: - added required tags in users profile - added border around content area.. based on revision 8366 Modified: trunk/core-identity/src/bin/portal-identity-war/style.css =================================================================== --- trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-19 16:49:45 UTC (rev 8369) @@ -14,6 +14,13 @@ border: 0; } +div.identity-ui div.tab-container{ + border-bottom:1px solid #B3C0C7; + border-right:1px solid #B3C0C7; + border-left:1px solid #B3C0C7; + padding: 15px 0 10px 0; +} + .identity-ui th { text-align: left; border: 0; @@ -55,7 +62,7 @@ /* Top nav. */ .identity-ui ul.topnav { - margin-left: 0; + margin: 0; padding: 4px 0px 3px; border-bottom: 1px solid #b3c0c7; } 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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -28,27 +28,27 @@ <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/> </h:panelGrid> </h:form> - + <br/> <table style="width: 100%;"> <tr> - <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></h3></td> + <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th> </tr> - <tr> + <tr class="portlet-section-body"> <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> + <tr class="portlet-section-body"> + <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"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></h3></td> + <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td> <td> <c:choose> @@ -67,7 +67,7 @@ </c:choose> </td> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td> <td> <c:choose> 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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -34,6 +34,14 @@ </h:column> <h:column> <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + </f:facet> + <a href="mailto:#{uiUser.attribute.email}"> + <h:outputText value="#{uiUser.attribute.email}"/> + </a> + </h:column> + <h:column> + <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> </f:facet> <h:outputText value="#{uiUser.attribute.givenname}"/> @@ -65,8 +73,10 @@ </h:column> </h:dataTable> </h:form> -<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"/> +<p style="text-align: center;"> + <h:commandButton value=" &#60; " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/> + <h:commandButton value=" &#62; " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/> +</p> <br/> <hr/> <h:form> 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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -8,7 +8,7 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - <h:form> + <h:form> <ul class="topnav"> <li> <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/> @@ -17,15 +17,19 @@ </ul> </h:form> +<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> <!-- Title --> <h:form> <ul class="objectpath"> <ui:insert name="title">Title</ui:insert> </ul> </h:form> - + <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> + </ui:define> +</ui:decorate> </div> 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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -54,7 +54,7 @@ <hr/> <h:form> - <p style="text-align: right"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> + <p style="text-align: right; padding-right: 5px;"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> </h:form> </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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -20,7 +20,7 @@ <ui:define name="content"> <f:verbatim> -<script> +<script type="text/javascript"> // <![CDATA[ function selectAll() { var form=$('pending'); 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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -91,9 +91,9 @@ </h:commandLink> </h:column> </h:dataTable> - <p style="text-align: right;"> - <h:commandLink value=" &#60; " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> - <h:commandLink value=" &#62; " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> + <p style="text-align: center;"> + <h:commandButton value=" &#60; " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> + <h:commandButton value=" &#62; " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> </p> </h:form> <br/> 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-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -7,8 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - - <h:form> + + <h:form> <ul class="topnav"> <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li> <li> @@ -16,7 +16,9 @@ </li> </ul> </h:form> - + +<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> <!-- Title --> <h:form> <ul class="objectpath"> @@ -26,5 +28,8 @@ <br/> <!-- Content --> <ui:insert name="content">Content</ui:insert> + + </ui:define> +</ui:decorate> </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -8,7 +8,9 @@ <c:if test="#{portletPreferenceValue.captcha == true}"> <hr/> - <h:graphicImage url="/jcaptcha" /> + <div id="captchaContainer" style="width: 200px; height: 100px"> + <h:graphicImage id="jcaptchaimp" url="/jcaptcha" /> + </div> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" /> <h:inputText id="validateCaptcha" value="" required="true"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -21,21 +21,31 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:outputText value=" *" rendered="#{metadataservice.timezone.required}" /> + </h:panelGroup> <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}" required="#{metadataservice.timezone.required}"> <f:selectItems value="#{metadataservice.timezone.values}" /> </h:selectOneMenu> <h:panelGroup /> <h:message for="timezone" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:outputText value=" *" rendered="#{metadataservice.theme.required}" /> + </h:panelGroup> <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}" required="#{metadataservice.theme.required}"> <f:selectItems value="#{metadataservice.theme.values}" /> </h:selectOneMenu> <h:panelGroup /> <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + <h:outputText value=" *" rendered="#{metadataservice.locale.required}" /> + </h:panelGroup> <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> <f:selectItems value="#{metadataservice.locale.values}" /> </h:selectOneMenu> @@ -51,17 +61,27 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.givenname.required}" /> + </h:panelGroup> <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}" required="#{metadataservice.givenname.required}"/> <h:panelGroup /> <h:message for="givenname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.familyname.required}" /> + </h:panelGroup> <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}" required="#{metadataservice.familyname.required}"/> <h:panelGroup /> <h:message for="lastname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.location.required}" /> + </h:panelGroup> <h:inputText id="location" value="#{manager.uiUser.attribute.location}" required="#{metadataservice.location.required}"/> <h:panelGroup /> <h:message for="location" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> @@ -75,32 +95,51 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + <h:outputText value=" *" rendered="#{metadataservice.skype.required}" /> + </h:panelGroup> <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}" required="#{metadataservice.skype.required}"/> <h:panelGroup /> <h:message for="skype" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:outputText value=" *" rendered="#{metadataservice.icq.required}" /> + </h:panelGroup> <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}" required="#{metadataservice.icq.required}"/> <h:panelGroup /> <h:message for="icq" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.aim.required}" /> + </h:panelGroup> <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}" required="#{metadataservice.aim.required}"/> <h:panelGroup /> <h:message for="aim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:outputText value=" *" rendered="#{metadataservice.msnm.required}" /> + </h:panelGroup> <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}" required="#{metadataservice.msnm.required}"/> <h:panelGroup /> <h:message for="msnm" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.yim.required}" /> + </h:panelGroup> <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}" required="#{metadataservice.yim.required}"/> <h:panelGroup /> <h:message for="yim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:outputText value=" *" rendered="#{metadataservice.xmmp.required}" /> + </h:panelGroup> <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}" required="#{metadataservice.xmmp.required}"/> <h:panelGroup /> <h:message for="xmmp" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> @@ -114,22 +153,37 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:outputText value=" *" rendered="#{metadataservice.homepage.required}" /> + </h:panelGroup> <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}" required="#{metadataservice.homepage.required}"/> <h:panelGroup /> <h:message for="homepage" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.occupation.required}" /> + </h:panelGroup> <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}" required="#{metadataservice.occupation.required}"/> <h:panelGroup /> <h:message for="occupation" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + <h:outputText value=" *" rendered="#{metadataservice.interests.required}" /> + </h:panelGroup> <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" required="#{metadataservice.interests.required}"/> <h:panelGroup /> <h:message for="interests" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + <h:outputText value=" *" rendered="#{metadataservice.signature.required}" /> + </h:panelGroup> <h:panelGroup> <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" required="#{metadataservice.signature.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}" /> @@ -137,7 +191,11 @@ <h:panelGroup /> <h:message for="signature" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + <h:outputText value=" *" rendered="#{metadataservice.extra.required}" /> + </h:panelGroup> <h:panelGroup> <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" required="#{metadataservice.extra.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}" /> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -16,8 +16,8 @@ <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: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}"/> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -36,7 +36,10 @@ <h:outputText id="username" value="#{manager.uiUser.username}"/> <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <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}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:inputText>