Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index e4b3f3981a8233d151305ea4ac12d5396828c37b..fe6563235856281a4dd157715bbc2831ffd18b08 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -6,39 +6,55 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para">
-               <fieldset id="terms_privacy">
-                       <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">#{msg.PRIVACY_TERMS_LEGEND}</legend>
+               <fieldset class="fieldset" id="terms_privacy">
+                       <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
+                       </legend>
 
                        <div class="table_row">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox styleClass="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
+                                       <h:selectBooleanCheckbox styleClass="checkbox" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
 
                                <div class="table_right75">
-                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}
+                                       <!-- @TODO Find something better //-->
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
+                                       <h:outputText value="&#160;" />
                                        <h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
-                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}
+                                       <h:outputText value="&#160;" />
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
 
                                <div class="clear"></div>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </h:panelGroup>
                        </div>
 
                        <div class="table_row">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox styleClass="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
+                                       <h:selectBooleanCheckbox styleClass="checkbox" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
 
                                <div class="table_right75">
-                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}
-                                       <h:link outcome="terms" target="_blank" value="#{msg.TERMS_CONDITIONS}" />
-                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}
+                                       <!-- @TODO Find something better //-->
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
+                                       <h:outputText value="&#160;" />
+                                       <h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
+                                       <h:outputText value="&#160;" />
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
 
                                <div class="clear"></div>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </h:panelGroup>
                        </div>
                </fieldset>
        </div>