Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / login / user / user_change_email_address_repeat_fields.tpl

diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index f138ece7ef0873f32b1439385d714b7607ea695d..7c3976d9bd342ba2faf16270b371e466297433f0 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -6,37 +6,37 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <div class="table_row">
+       <h:panelGroup styleClass="table_row" layout="block">
                <div class="table_left">
                        <h:outputLabel for="emailAddress" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL}" />
                </div>
 
                <div class="table_right">
-                       <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                       <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator validatorId="EmailAddressValidator" />
                        </h:inputText>
                </div>
 
                <div class="clear"></div>
+       </h:panelGroup>
 
-               <h:panelGroup styleClass="error_container" layout="block">
-                       <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-               </h:panelGroup>
-       </div>
+       <h:panelGroup styleClass="error_container" layout="block">
+               <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+       </h:panelGroup>
 
-       <div class="table_row">
+       <h:panelGroup styleClass="table_row" layout="block">
                <div class="table_left">
                        <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_USER_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" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+                       <h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{userEmailChangeController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
 
                <div class="clear"></div>
+       </h:panelGroup>
 
-               <h:panelGroup styleClass="error_container" layout="block">
-                       <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-               </h:panelGroup>
-       </div>
+       <h:panelGroup styleClass="error_container" layout="block">
+               <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+       </h:panelGroup>
 </ui:composition>