removed double-redundant XML parsing instructions, (X)HTML doesn't want it anyway

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

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index ec48401064af064e1b5581f527364d29aaa83afb..426b3b818b297f6db0d03dc6962e0ec7c13155d0 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -1,17 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:define name="title"><ui:insert name="guest_title" class="guest_title" /></ui:define>
+       <ui:define name="title">
+               <ui:insert name="guest_title">Default guest title</ui:insert>
+       </ui:define>
+
+       <ui:define name="menu">
+               <ui:include src="/WEB-INF/templates/guest/guest_menu.tpl" />
+       </ui:define>
 
        <!--
-       Show basket if it contains items, else show an empty basketController.
+       Show basket if it contains items, else show an empty basket.
        //-->
-       <ui:fragment rendered="#{basketController.isEmpty()}">
-               <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
-       </ui:fragment>
-       <ui:fragment rendered="#{basketController.hasItems()}">
-               <ui:include src="/WEB-INF/templates/basket/mini_basketController.tpl" />
-       </ui:fragment>
+       <ui:define name="basket">
+               <ui:fragment rendered="#{basketController.isEmpty()}">
+                       <!-- Empty basket //-->
+                       <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
+               </ui:fragment>
+
+               <ui:fragment rendered="#{basketController.hasItems()}">
+                       <!-- At least one item is there //-->
+                       <ui:include src="/WEB-INF/templates/basket/mini_basket.tpl" />
+               </ui:fragment>
+       </ui:define>
+
+       <ui:define name="footer">
+               <ui:include id="footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+       </ui:define>
 </ui:composition>