Please cherry-pick:

[jjobs-war.git] / web / user / login_user_change_email_address.xhtml

diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index 36821750860c3517da3aeb557c1f691c126c8b7d..fedd9d48bd6c54ecdd7809a5ee53a100c24329fd 100644 (file)
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,6 +15,8 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+
                <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
                        <div class="table_header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
@@ -33,8 +36,6 @@
                                                <div class="table_right">
                                                        <h:outputText value="#{contactController.emailAddress}" />
                                                </div>
-
-                                               <div class="clear"></div>
                                        </h:panelGroup>
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
@@ -51,15 +52,8 @@
                        </h:form>
                </h:panelGroup>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
-
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>
        </ui:define>
 </ui:composition>