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 92ef3dbd32376da8e5729dcae795798d461e607c..25a39b1da66033c0b1701d0eccbd3d83db50c7d7 100644 (file)
--- 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 eb4dd3280e9a17489b8d1a1f64701ccbad24669e..3fd51eae381616d69955baeed1cb9f0e97fb13bc 100644 (file)
--- 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 98b02eb15c05a25b9c605ca4ea93a52a3a24f2e5..a6c8f19db0085d47eb3adaf885ed7b1f73a9f4f0 100644 (file)
--- 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 a965fee1eaf0779e70dd75ce681ff6687fb10dde..2912b91afd6cde6eafcd93350f1d3cba1a890dd3 100644 (file)
--- 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 b8c0d07bcfaae20ef0323b4fd43ca00d5ee4c1ba..17b42720b836e9fea46b63126c77c8496e0c1c85 100644 (file)
--- 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 fadc8b530484b291e76818339ad3104e87a92ca1..836c6acaac087ccff38e22465e4d3def3beb853f 100644 (file)
--- 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 64e9d96c106db0410ec56e8c62a8200a94862779..ffe5e52513bdfa04f66876970353b304991c370f 100644 (file)
--- 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 5e80a5cd7450200343bf3508206732130d6fb7c2..725ca347b86de455ae8592548c10788be6cc9164 100644 (file)
--- 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 96a0f0f1f155534c232a7b60ff859e603198b3b7..73e9e26214ce563ca95fc442ca2c9d385cb94079 100644 (file)
--- 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}" />