updated jar(s)

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

diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index 64a62680307985a5c1df304fb2d889560b4681a8..ec2a7cfb0ffdb12f5b5b90ff740db99222e9fefc 100644 (file)
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -15,34 +15,29 @@
                </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_CHANGE_PERSONAL_DATA_TITLE}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_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="login_change_personal_form">
-                                               <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>
-                               <<<<<<< HEAD
-                               =======
-                       </ui:fragment>
+                                       <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>
 
                        <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}" />
-                               >>>>>>> be1ec6b... Continued a bit: (please cherry-pick)
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">