Continued a bit:

[pizzaservice-war.git] / web / WEB-INF / templates / basket / mini_basket.tpl

diff --git a/web/WEB-INF/templates/basket/mini_basket.tpl b/web/WEB-INF/templates/basket/mini_basket.tpl
index 409b30562c2eb543aff2127a96457d8a58e4d787..41637ec1d5be9ce83f50dafd12ba1629fab0c198 100644 (file)
--- a/web/WEB-INF/templates/basket/mini_basket.tpl
+++ b/web/WEB-INF/templates/basket/mini_basket.tpl
@@ -1,24 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        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="mini_basket_box">
                <div class="mini_basket_header">
-                       #{msg.mini_basketController.header}
+                       #{msg.MINI_BASKET_TITLE}
                </div>
 
                <div class="mini_basket_last">
-                       #{msg.mini_basketController.last_item}
+                       <h:outputFormat value="#{msg.MINI_BASKET_LAST_ITEM}">
+                               <f:param value="#{basketController.outputLastAddedItem()}" />
+                       </h:outputFormat>
                </div>
 
                <div class="mini_basket_more">
-                       #{msg.mini_basketController.additional_items}
+                       <h:outputFormat value="#{msg.MINI_BASKET_ADDITIONAL_ITEMS}">
+                               <f:param value="#{basketController.lastNumRows}" />
+                       </h:outputFormat>
                </div>
 
                <div class="mini_basket_link">
-                       <h:link id="to_basket" outcome="basket" title="#{msg.mini_basketController.to_basket}" value="#{msg.mini_basketController.to_basket}" />
+                       <h:link id="to_basket" outcome="basket" title="#{msg.LINK_TO_BASKET_TITLE}" value="#{msg.LINK_TO_BASKET}" />
                </div>
        </div>
 </ui:composition>