]> git.mxchange.org Git - addressbook-war.git/blobdiff - web/user/login_user_change_personal_data.xhtml
Maybe cherry-pick:
[addressbook-war.git] / web / user / login_user_change_personal_data.xhtml
index 0e33031073e592f0adcd2ac112dfd1e13dbe8693..32286f303ff4d4c6fa614a5bf29b2d8e2e01d08e 100644 (file)
@@ -1,3 +1,4 @@
+<?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}"
@@ -8,36 +9,41 @@
        >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
+                               </div>
 
-                                       <h:form id="form_login_change_personal">
-                                               <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+                               <h:form id="form_login_change_personal">
+                                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-                                               <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-                                               <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+                                       <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-                                               </div>
-                                       </h:form>
-                               </div>
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+                                       </div>
+                               </h:form>
+                       </h:panelGroup>
+
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
-
                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                                <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
                        </ui:fragment>