updated jar(s)

[pizzaservice-war.git] / web / user / login_change_email_address.xhtml
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml

index ce3741e0e1a37c68e13c05f7279c823441fd04dc..f329ea456e25c7147a37c948a76c182da53d12e5 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -1,4 +1,3 @@
-<?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}"
@@ -16,13 +15,13 @@
                 </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">
                                                 <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                                         </div>
  
-                                       <h:form id="login_change_email_address_form">
+                                       <h:form id="form_login_change_email_address">
                                                 <div class="para">
                                                         <fieldset id="change_email">
                                                                 <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
@@ -55,6 +54,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 loginController.isUserLoggedIn()}">
                                 <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                         </ui:fragment>