From: Roland Häder <roland@mxchange.org>
Date: Wed, 19 Apr 2017 15:41:08 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=140820859d239d80838873f7faf8fb58e7a6163d;p=pizzaservice-war.git

Please cherry-pick:
- text should be wrapped in h:outputText as this is like a GUI for web browsers

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

diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml
index 92ef3dbd..25a39b1d 100644
--- a/web/WEB-INF/templates.dist/admin_page.xhtml
+++ b/web/WEB-INF/templates.dist/admin_page.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_FOO}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
index eb4dd328..3fd51eae 100644
--- a/web/WEB-INF/templates.dist/guest_login_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml
index 98b02eb1..a6c8f19d 100644
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index a965fee1..2912b91a 100644
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -7,10 +7,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.SUB_TITLE_LOGIN_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index b8c0d07b..17b42720 100644
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -8,7 +8,9 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index fadc8b53..836c6aca 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -13,7 +13,9 @@
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 64e9d96c..ffe5e525 100644
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -7,8 +7,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="customer_login">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 5e80a5cd..725ca347 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -8,7 +8,9 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 96a0f0f1..73e9e262 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -8,7 +8,9 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />