End-of-line character is LF by default now

[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 86f2b0e9596b15900e1d78bc00d38457a179788a..4d70ccb0b27f1d5978fd6d39f5c6fe0b7812225c 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -3,10 +3,10 @@
  <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:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
@@ -33,35 +33,13 @@
                                                                         </div>
  
                                                                         <div class="table_right">
-                                                                               #{userController.emailAddress}
+                                                                               #{contactController.emailAddress}
                                                                         </div>
  
                                                                         <div class="clear"></div>
                                                                 </div>
  
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
+                                                               <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
                                                         </fieldset>
                                                 </div>
  
@@ -75,8 +53,8 @@
                                 </div>
                         </ui:fragment>
  
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                         </ui:fragment>
                 </ui:define>
         </ui:composition>