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 981c8f373ee7d587b1a41d0de136db9127fe4b63..7567f4b5ac2111ff19c9823de12ae569b8b5b0b7 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -3,41 +3,57 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para">
-               <fieldset id="terms_privacy">
-                       <legend title="Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren.">Rechtliches:</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">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="Bitte den Datenschutzbestimmungen zustimmen.">
-                                               <f:validator validatorId="PrivacyTermsCheckboxValidator" />
+                                       <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">
-                                       Ja, ich habe die <h:link outcome="privacy" target="_blank" value="Datenschutzbestimmungen" /> gelesen und
-                                       auch verstanden.
+                                       <!-- @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}" />
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <div class="table_row">
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </h:panelGroup>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="Bitte den AGBs zustimmen.">
-                                               <f:validator validatorId="PrivacyTermsCheckboxValidator" />
+                                       <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">
-                                       Ja, ich habe die <h:link outcome="terms" target="_blank" value="Allgemeinen Geschäftsbedingungen" /> gelesen und
-                                       auch verstanden.
+                                       <!-- @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="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </h:panelGroup>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </ui:composition>