From f4069349006967f54271e2b995ef63fc749edd40 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 18:22:35 +0200
Subject: [PATCH] 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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/templates/basket/full_basket.tpl  | 18 +++++++++++-----
 web/WEB-INF/templates/basket/mini_basket.tpl  |  2 +-
 .../templates/basket/mini_basket_empty.tpl    | 21 -------------------
 web/WEB-INF/templates/basket/total_sum.tpl    |  3 ++-
 web/WEB-INF/templates/guest/guest_base.tpl    |  3 +++
 5 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 web/WEB-INF/templates/basket/mini_basket_empty.tpl

diff --git a/web/WEB-INF/templates/basket/full_basket.tpl b/web/WEB-INF/templates/basket/full_basket.tpl
index bb8ab3b8..1b80adbc 100644
--- 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 41637ec1..e3fbd777 100644
--- 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
index 61cf9dcd..00000000
--- 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 3b6d11f7..f4609421 100644
--- 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 77ae70e9..45c570ee 100644
--- 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>
 
-- 
2.39.5