updated jar(s)

[pizzaservice-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 b8aa7c0d3c7f12f119e38c7af09f2e85d37ab88b..0676793faac5563a30f18c262fb27035019e4346 100644 (file)
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -1,14 +1,13 @@
-<?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"
-         >
+       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/login_base.tpl">
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
                 <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA}</ui:define>
  
                 <ui:define name="content_header">
@@ -16,16 +15,16 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <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">
-                                               #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
                                         </div>
  
-                                       <h:form id="login_change_personal_form">
+                                       <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/login_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" />
  
@@ -37,6 +36,12 @@
                                 </div>
                         </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>
+
                         <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                 <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                         </ui:fragment>