]> git.mxchange.org Git - pizzaservice-war.git/blobdiff - web/customer/checkout2.xhtml
Please cherry-pick:
[pizzaservice-war.git] / web / customer / checkout2.xhtml
index c57311210a7b642fec10a6532df3fad08c7ff65b..3a019542df2a1655e7ba4805d8123557818262f4 100644 (file)
@@ -1,61 +1,52 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
-
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CHECKOUT2}</ui:define>
-
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_CHECKOUT2}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="basket_content">
-                               <ui:include src="/WEB-INF/templates/basket/full_basket.tpl" />
-
-                               <ui:include src="/WEB-INF/templates/basket/total_sum.tpl" />
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_CHECKOUT2}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_CHECKOUT2}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <div class="basket_content">
+                       <ui:include src="/WEB-INF/templates/basket/full_basket.tpl" />
+
+                       <ui:include src="/WEB-INF/templates/basket/total_sum.tpl" />
+               </div>
+
+               <div class="checkout_outer">
+                       <div class="checkout_title">
+                               <h:outputText value="#{msg.GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE}" />
                        </div>
 
-                       <div class="checkout_outer">
-                               <div class="checkout_title">
-                                       #{msg.GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE}
-                               </div>
-
-                               <div class="registration_form">
-                                       <h:form acceptcharset="utf-8" id="checkout_form">
-                                               <div class="table">
-                                                       <div class="table_header">
-                                                               #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
-                                                       </div>
+                       <div class="registration_form">
+                               <h:form id="checkout_form">
+                                       <div class="table">
+                                               <div class="table_header">
+                                                       <h:outputText value="#{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}" />
+                                               </div>
 
-                                                       <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
+                                               <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
 
-                                                       <div class="para">
-                                                               Derzeit ist nur eine Bezahlung gegen Rechnung möglich.
-                                                       </div>
+                                               <div class="para">
+                                                       <!-- @TODO Move this to i18n bundle //-->
+                                                       Derzeit ist nur eine Bezahlung gegen Rechnung möglich.
+                                               </div>
 
-                                                       <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+                                               <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                                                       <div class="table_footer">
-                                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                               <h:commandButton class="submit" type="submit" id="checkout" value="#{msg.BUTTON_COMPLETE_ORDER}" action="#{checkoutController.doCheckout()}" />
-                                                       </div>
+                                               <div class="table_footer">
+                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton class="submit" type="submit" id="checkout" value="#{msg.BUTTON_COMPLETE_ORDER}" action="#{checkoutController.doCheckout()}" />
                                                </div>
-                                       </h:form>
-                               </div>
+                                       </div>
+                               </h:form>
                        </div>
-               </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
-       </ui:composition>
-</html>
+               </div>
+       </ui:define>
+</ui:composition>