Continued a bit: (please cherry-pick)

[addressbook-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 475d96f61c69ec5a2086a818a84d7011ac8554b6..3fb7ca98c028f37026ec50a1334ab5e777500853 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,24 +15,26 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and not userLoginController.ifUserMustChangePassword()}">
                                 <div class="table">
                                         <div class="table_header">
-                                               #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                                         </div>
  
                                         <h:form id="login_change_email_address_form">
                                                 <div class="para">
                                                         <fieldset id="change_email">
-                                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
+                                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+                                                               </legend>
  
                                                                 <div class="table_row">
                                                                         <div class="table_left">
-                                                                               #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
+                                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
                                                                         </div>
  
                                                                         <div class="table_right">
-                                                                               #{contactController.emailAddress}
+                                                                               <h:outputText value="#{contactController.emailAddress}" />
                                                                         </div>
  
                                                                         <div class="clear"></div>
@@ -53,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>