]> git.mxchange.org Git - jjobs-war.git/blobdiff - web/user/login_user_change_email_address.xhtml
Please cherry-pick:
[jjobs-war.git] / web / user / login_user_change_email_address.xhtml
index 4b6a1b0af288b0569d6243eacab175e07df12a02..fedd9d48bd6c54ecdd7809a5ee53a100c24329fd 100644 (file)
@@ -1,70 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <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}" />
+<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">
+
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+       </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}" />
+                       </div>
+
+                       <h:form id="form_user_change_email_address">
+                               <fieldset class="fieldset" id="change_email">
+                                       <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+                                       </legend>
+
+                                       <h:panelGroup styleClass="table_row" layout="block">
+                                               <div class="table_left">
+                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
+                                               </div>
+
+                                               <div class="table_right">
+                                                       <h:outputText value="#{contactController.emailAddress}" />
+                                               </div>
+                                       </h:panelGroup>
+
+                                       <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
+                               </fieldset>
+
+                               <div class="para"></div>
+
+                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
                                </div>
-
-                               <h:form id="form_user_change_email_address">
-                                       <fieldset class="fieldset" id="change_email">
-                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
-                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
-                                               </legend>
-
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
-                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
-                                                       </div>
-
-                                                       <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" />
-                                       </fieldset>
-
-                                       <div class="para"></div>
-
-                                       <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
-                                       </div>
-                               </h:form>
-                       </h:panelGroup>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-                               <ui:include src="/WEB-INF/templates/generic/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:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+                       </h:form>
+               </h:panelGroup>
+
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>