Don't cherry-pick:

- text needs to be wrapped in h:outputText, here too.
- no need for mini_basket_empty.tpl, there is a generic message_box.tpl

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/basket/full_basket.tpl b/web/WEB-INF/templates/basket/full_basket.tpl
index bb8ab3b8d9feae4535ee07264cf83f65c24149be..1b80adbce706013a8d63c607c2477cc51e97c238 100644 (file)
--- a/web/WEB-INF/templates/basket/full_basket.tpl
+++ b/web/WEB-INF/templates/basket/full_basket.tpl
@@ -7,15 +7,19 @@
 
        <h:dataTable id="table_show_full_basket" var="item" value="#{basketController.allItems()}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_FULL_BASKET}" rendered="#{basketController.hasItems()}">
                <h:column>
-                       <f:facet name="header">#{msg.GUEST_ITEM_TITLE}</f:facet>
+                       <f:facet name="header">
+                               <h:outputText value="#{msg.GUEST_ITEM_TITLE}" />
+                       </f:facet>
 
                        <ui:fragment rendered="#{item.isProductType()}">
-                               #{item.itemProduct.productTitle}
+                               <h:outputText value="#{item.itemProduct.productTitle}" />
                        </ui:fragment>
                </h:column>
 
                <h:column>
-                       <f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
+                       <f:facet name="header">
+                               <h:outputText value="#{msg.SINGLE_PRODUCT_PRICE}" />
+                       </f:facet>
 
                        <div class="item_price">
                                <ui:fragment rendered="#{item.isProductType()}">
@@ -27,7 +31,9 @@
                </h:column>
 
                <h:column>
-                       <f:facet name="header">#{msg.CHANGE_ITEM_AMOUNT}</f:facet>
+                       <f:facet name="header">
+                               <h:outputText value="#{msg.CHANGE_ITEM_AMOUNT}" />
+                       </f:facet>
 
                        <h:form id="add_item">
                                <h:outputText id="amount" value="#{item.orderedAmount}">
@@ -36,7 +42,9 @@
                </h:column>
 
                <h:column>
-                       <f:facet name="header">#{msg.TOTAL_ITEM_PRICE}</f:facet>
+                       <f:facet name="header">
+                               <h:outputText value="#{msg.TOTAL_ITEM_PRICE}" />
+                       </f:facet>
 
                        <div class="item_total_price">
                                <h:outputText styleClass="price" id="item_price" value="#{basketController.calculateItemPrice(item)}" rendered="#{item.isProductType()}">

diff --git a/web/WEB-INF/templates/basket/mini_basket.tpl b/web/WEB-INF/templates/basket/mini_basket.tpl
index 41637ec1d5be9ce83f50dafd12ba1629fab0c198..e3fbd777a6751f1ab2fe71af4b10397e3c4da515 100644 (file)
--- a/web/WEB-INF/templates/basket/mini_basket.tpl
+++ b/web/WEB-INF/templates/basket/mini_basket.tpl
@@ -7,7 +7,7 @@
 
        <div class="mini_basket_box">
                <div class="mini_basket_header">
-                       #{msg.MINI_BASKET_TITLE}
+                       <h:outputText value="#{msg.MINI_BASKET_TITLE}" />
                </div>
 
                <div class="mini_basket_last">

diff --git a/web/WEB-INF/templates/basket/mini_basket_empty.tpl b/web/WEB-INF/templates/basket/mini_basket_empty.tpl
deleted file mode 100644 (file)
index 61cf9dc..0000000
--- a/web/WEB-INF/templates/basket/mini_basket_empty.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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://xmlns.jcp.org/jsf/facelets">
-
-       <div class="mini_basket_box">
-               <div class="mini_basket_header">
-                       #{msg.MINI_BASKET_TITLE}
-               </div>
-
-               <div class="mini_basket_last">
-                       #{msg.MINI_BASKET_IS_EMPTY}
-               </div>
-
-               <div class="mini_basket_link">
-                       <h:link id="to_index" outcome="index" title="#{msg.LINK_CONTINUE_SHOPPING_TITLE}" value="#{msg.LINK_CONTINUE_SHOPPING}" />
-               </div>
-       </div>
-</ui:composition>

diff --git a/web/WEB-INF/templates/basket/total_sum.tpl b/web/WEB-INF/templates/basket/total_sum.tpl
index 3b6d11f7f38e05ce7b969e780ec147f8b97323a3..f460942179d13aa1a0423165425012b1f8247822 100644 (file)
--- a/web/WEB-INF/templates/basket/total_sum.tpl
+++ b/web/WEB-INF/templates/basket/total_sum.tpl
@@ -9,7 +9,8 @@
 
        <ui:fragment rendered="#{basketController.hasItems()}">
                <div class="totals_container">
-                       #{msg.TOTAL_ORDER_PRICE}
+                       <h:outputText value="#{msg.TOTAL_ORDER_PRICE}" />
+
                        <h:outputText styleClass="price" id="total_sum" value="#{basketController.calculateTotalPrice()}">
                                <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
                        </h:outputText>

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 77ae70e93c874ee8ae18ffd65adadb72bbea8898..45c570eef624993d66e399b9511fff2e1eed7253 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -20,6 +20,9 @@
        <ui:define name="basket">
                <ui:fragment rendered="#{basketController.isEmpty()}">
                        <!-- Empty basket //-->
+                       <ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
+                               <ui:param name="message" value="#{msg.MINI_BASKET_IS_EMPTY}" />
+                       </ui:include>
                        <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
                </ui:fragment>