Please cherry-pick (Massive rewrite):

[pizzaservice-war.git] / web / WEB-INF / templates / guest / guest_email_address_repeat_fields.tpl

diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index 0a47f71b8d101210ab462f9b7263f4a14267e3af..0f512b25db11dc60295e7d183ced47c596ca2ca5 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -12,16 +12,16 @@
                </div>
 
                <div class="table_right_medium">
-                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.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>
+       <h:panelGroup styleClass="error_container" layout="block">
+               <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
        </h:panelGroup>
 
        <h:panelGroup styleClass="table_row" layout="block">
@@ -34,9 +34,9 @@
                </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>
+       <h:panelGroup styleClass="error_container" layout="block">
+               <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
        </h:panelGroup>
 </ui:composition>