Moved footer definition to corresponding foo_base.tpl templates

[pizzaservice-war.git] / web / customer / checkout2.xhtml

diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml
index 6fd5a2ef5f650df21273f7e55c175f241efeceae..fa548f07786256e4a1d29f41d1a3e54d0b36897a 100644 (file)
--- a/web/customer/checkout2.xhtml
+++ b/web/customer/checkout2.xhtml
@@ -9,19 +9,15 @@
        <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:include src="/WEB-INF/templates/basket/total_sum.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_INDEX_CHECKOUT2}
+                       #{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">
@@ -30,7 +26,7 @@
                                </div>
 
                                <div class="registration_form">
-                                       <h:form acceptcharset="utf-8" id="checkout_form">
+                                       <h:form id="checkout_form">
                                                <div class="table">
                                                        <div class="table_header">
                                                                #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
@@ -53,9 +49,5 @@
                                </div>
                        </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>