Please cherry-pick:

- placed more text into h:outputText tags

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 069728559206e4365c28b744ee87c3d345c00bab..6e801e5bd4d71a1a8eb25d956e399d1958c9cae3 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 fa84908de2ceca298d4a4b87e0ea84f061ecac1d..c42f45c3e2b7f2e3b7b0f31d11f1ef6abca53083 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 7d99bc174053ea7e3a0307512f0d9e066186bed8..a47f1bf5d386c9c453b78ad3ddd0b736f2e11b0c 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -7,14 +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="menu">
-                       <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_FOO}" />
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_LOGIN_FOO}
+                       <h:outputText value="#{msg.SUB_TITLE_USER_LOGIN_FOO}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 0b87c3252187aade2ed9f7fa5b5db4eb40b16850..f394ec0d6213a032139070bce4b628df0706f8ab 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -5,7 +5,9 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
+       <ui:define name="title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" /> - <ui:insert name="login_title">Default login title</ui:insert>
+       </ui:define>
 
        <ui:define name="menu">
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 25b55f2948a8a5749abe5f8cc2934a3e7a9fee94..7e5a13f39afc826caabbfddbf0adc1c64d8884c1 100644 (file)
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LOGOUT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOGOUT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 6a069436a579802e2d8e7f9c83d6cb564f25253e..a7bc592c2c7b1819e5ab8e4e29217c3c83c2a51a 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index ecb3d09da2af1a696426eaa5310c9ee8414ed9b0..cfe2f73561a174a9aa99df9a1c992ef7fce415fb 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 687aac11f1d2b22610d5cdde828b96893fc3c118..ae78b819fc60fd5de776ee76cb4c6e5e2544ec8e 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -9,10 +9,12 @@
        xmlns:p="http://primefaces.org/ui">
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index c8fe4334345c696fc8eda8cd1f062de4128d0182..edf0c917a8a49ff824a7b320722c46b24c227731 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 3d7970983b7afa7d8ddbf78243d85ceb9f2b4b85..ed1ce5359b03a6b42b8dd113a3cc872741520651 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 6d0e615d64524e3f2aa365fd6f026d40f72557c1..348a479deb6909a37cc573c63121abefc1912cfa 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 489ee1f07de014e0e0ee6f259e3fc183e2fc7f1d..933d7e71d91e2a1314c2f0134c59d5ee7facbd2f 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 1c226a3c1722ab4afc40ed154dddb309ced20155..417485ac76adef36144a0840a4e4985e9dd6f8a6 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -15,10 +15,12 @@
        </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
index c5bee9d3c21867851bd3fc10869a8e9d165c72a2..256dc93219446081c7331820ad43b81e10dadb3f 100644 (file)
--- a/web/admin/country/admin_country_delete.xhtml
+++ b/web/admin/country/admin_country_delete.xhtml
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html
        lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -8,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
index efede20cf6f1cda0331ff1a1ff22cbd8a65c88f3..f52766e4067fc58bf3bc1acc9c7be50845b350c8 100644 (file)
--- a/web/admin/country/admin_country_edit.xhtml
+++ b/web/admin/country/admin_country_edit.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index a34b34060877ab4d5c75b9a5d0a4df939ca44f54..d821574a899fe5f546d25876ca44e2f6138833db 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index ade80e5a9e086535db46a01ba2ad1ea917e3eed8..508a6ff0ddd6583d8560971490c2065b8c1dbfd8 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -14,10 +14,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_FAX}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_FAX}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 920737e3ea1e29cbca654d51ff9dec05ce030027..a15bc787dcd8b43b0cbf3740eed3a4d3f6dc8e6b 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_FAX}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_FAX}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_FAX}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index c8bd8941bc52dc04e47249825a60e9d892cc34ce..97a897c3c54c2eae980d4b0929a0da9d30f49843 100644 (file)
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 81251537ef5d12d6c82644d45def52be2144393f..d630c0f6ecf0b2210e9bf67419156efe3956b36f 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -14,10 +14,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_FAX}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
index eb077993d58893e4f2fb4587157b9a32ddf6f117..4f9e2292df3052fc872321c36e26be703b9fd490 100644 (file)
--- a/web/admin/index.xhtml
+++ b/web/admin/index.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_WELCOME}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_WELCOME}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_WELCOME}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 67f398ee2c4ab5e764fb0fe340430c4af08a1ed9..f0079984ce777b623728beb439b1f1e57053192d 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -14,10 +14,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index fdde99c1f1c2ce5073db28cdb74d88e646fba735..6a25bc4c879f8ff2ca0ef800aaec007756f2b0bd 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 82b000d2e242850cb23c335d01c005a0f359b7c7..ebf79527df0e9ec1dca42d55bf56ad7ac32744b2 100644 (file)
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 6ceeb3cabf356011658f49b65dc1e0c8d2d8fe52..6b1c00511c82434cdde7a1ddebf049b406cf84e7 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -14,10 +14,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index c93778518bc44c70ab64a8be9f59ce00cfbd88ba..7f0d5b902a0a19f43e9127da07886d6e7405c830 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -14,10 +14,12 @@
        </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 88aef070f7fc781f0805872bed6b89914582d213..b2ff95ddb38a76b2f3e5cb5e4842632d702d3856 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -15,10 +15,12 @@
        </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index daf4f5bb13dd9e276ecb57388d9141c072928ba2..54b1fc6ba0315cd4490fafd844465936374bc9bc 100644 (file)
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 6beb5e6811fd90f8699df7ccacc67ebe520f8312..ee3d99c12dfa391cccf51ddece621cd54d15909f 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -14,7 +14,9 @@
        </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}

diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
index 99566d6b6e9e83e591ccad9bfe2b2695c887a604..1553f7509b2644308e08197ad8bb4a2829a15a36 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
index da2bbb4557bcffe50453e443ff4b792da72542ca..b4a05224fc8c219d782837bd1214c38034488591 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index a34d37774882942f4017eee9b58bae781cd2fb76..345957e216598ca53eb8a597297bda7577348456 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
index 153b763b6feb937b0177b48d1c7d3e137661b4e6..fb95c150013f7114a8e2bfab86712956ae0a2620 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 2dda44de6aa58996b24bee8bbba9add3b0fa171e..7ae2cb457c02cfcaccc27ed48933ee3d3146d8c7 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 083296fa3abf3eca1b3323b44276bfc425f5cb8e..67917375e9a317bccbabd1b8921c84440e546ae0 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -16,10 +16,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 65bb4c671cc65ab8ad14f1d4a658a7f7da3daea3..dab2e8f172a467aba811d06a3a3f6f4f4253fc77 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -8,10 +8,12 @@
        xmlns:p="http://primefaces.org/ui">
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 2650593a91900f032e2abfb5c3afcb0f4be7560f..5863e1dcb0b1c806e1063eea34c9e2d4f383cdf0 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 0444377337010ab0cab8fe6b829cc33ab0f7485b..39977d141e54c5013ddebb3ec210298a1bbacb14 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -16,7 +16,9 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOCK_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        #{msg.CONTENT_TITLE_ADMIN_LOCK_USER}

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 2694b41b92637e4b4fb813b8f0419fb59ff583e2..e96b16010aa385f2cede8afe0e4eee8dfc9e4c62 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 9682c043057944d9188dcc49a314aaaeff52745f..6963266e3e505c83606947e6941b20d69163389e 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -15,10 +15,12 @@
        </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/exception.xhtml b/web/exception.xhtml
index 2996a8c0afabe4b940346acf05c67bcf858b4a7d..0e145b20937b430d3e979a73a679e5f74ce5fec1 100644 (file)
--- a/web/exception.xhtml
+++ b/web/exception.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_EXCEPTION_THROWN}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_EXCEPTION_THROWN}
+                       <h:outputText value="#{msg.CONTENT_TITLE_EXCEPTION_THROWN}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
index a6d5789c2cbc49651c99ea30d2389bb57a0834af..0fde6a06ed072d6560b60bf8987ebc1fc27df4a9 100644 (file)
--- a/web/guest/user/confirm_account.xhtml
+++ b/web/guest/user/confirm_account.xhtml
@@ -15,10 +15,12 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index d28bc0ce85bb0f2dea06f89069dab0302c681dfa..0e7102760989da4badbaa83f7d39674c6a70b22d 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -8,10 +8,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOGIN}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml
index 3bce0b7a83306a4a40f2e71171a9c63bd6123adf..03d80839d2b3cbfeaf5036fd15a3d811bd8df785 100644 (file)
--- a/web/guest/user/login_error.xhtml
+++ b/web/guest/user/login_error.xhtml
@@ -9,10 +9,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_ERROR}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOGIN_ERROR}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_ERROR}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index 4e8536ea739ccf5e6bd15c99566014a2b520e571..d7db1d1266827f04da321d69c8956cd501034c70 100644 (file)
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -8,10 +8,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
index 2ee42d82190bb63490b99e53e2604387553852fe..1bf51168c75e3e0d122356e7d8ee79e0ef3cc222 100644 (file)
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -8,19 +8,23 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_REGISTER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
                </ui:define>
 
                <ui:define name="content">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                        <div class="para">
-                                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
+                                               <h:outputText value="&nbsp;" />
                                                <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                                               #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+                                               <h:outputText value="&nbsp;" />
+                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                        </div>
                                </ui:fragment>
 

diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index 5a4d6080c7f5b9c62b1ae5fc2d14f67ca96fd298..65b3bda1c7fd6200d5d023968f079fa0df3d9553 100644 (file)
--- a/web/guest/user/register_done.xhtml
+++ b/web/guest/user/register_done.xhtml
@@ -8,10 +8,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_REGISTER_DONE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml
index e00f554292871dae0f97309a4535b6dea1f78d35..4737d08770b89212fdde4f4f678ea1354041ebeb 100644 (file)
--- a/web/guest/user/register_page2.xhtml
+++ b/web/guest/user/register_page2.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml
index 2cf5efea91d748bd61436d94382f0810ae0cb0dc..c062782f05859367d8c605cd8de75d0e7ca95d69 100644 (file)
--- a/web/guest/user/resend_done.xhtml
+++ b/web/guest/user/resend_done.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_RESEND_DONE}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_RESEND_DONE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_RESEND_DONE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index bbd665b9a8d11ccda5b4909f5c788207961a839f..da489ba5bdf9aae980e2d892f8ea66ea7bfc51cb 100644 (file)
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_RESEND_LINK}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 65ba73f29593e22fd1e59ad88be540c65889b827..c07179adeb958a5b844622e8e1fc60ed0d66c57f 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -7,10 +7,12 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core">
 
        <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LIST}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LIST}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 62ff8d7d9f8090b6730fdb538542b742b4b04431..5428ccd4109b303fed0af18202c538e3275ea263 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -16,11 +16,16 @@
                        </f:metadata>
                </ui:define>
 
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}</ui:define>
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
+               </ui:define>
+
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 5578d959b6887c86a8223dd782ef07e4e5149f59..3a54f92c939d39c67b85e396da593562dfff4cee 100644 (file)
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_IMPRINT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_IMPRINT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/index.xhtml b/web/index.xhtml
index 68ad41bf228459b98292bf8d207d86f54a27d179..9b7f7cdedc342ee74886dfb8e0e21c171efdc99f 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_WELCOME}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 6cb3893e450f283e5bf1d6c4fa700099c38ea754..01a29d1826f6089e82cc169e14fdcccdcdcad4c0 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/terms.xhtml b/web/terms.xhtml
index 1e7acae567ecec8aa754ac663ca9a24f8c927758..c6be672ebb3f5cfeea9427516ef3dd14c64ea2f9 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_TERMS}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_TERMS}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 73a2fdbb71a41e713557eb442a7b3cb68284403e..551dcc80addedfb5587ca6d8653d0ccd10c39ace 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -7,11 +7,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index bff6c9021ba64cf78b864202c420af85ccf5e0e4..fc370b845afd1a2bd5e2e22aae93f5f520890966 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index ec2a7cfb0ffdb12f5b5b90ff740db99222e9fefc..75590cdf4cd76996342faa8b365f205a53a03d74 100644 (file)
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index f33cf16a0af105f38350595e81d505dee8d360be..d2b1e88cfc3707dcfa5948e2fac52f4979c58c4b 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -8,10 +8,12 @@
        >
 
        <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_USER_LOGIN_CONTACT_DATA_SAVED}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 62b20ab0f47429c74a2767bf739f0a72dcd90dd9..e92ea8fe912c275625c745967095b8d636961de3 100644 (file)
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -8,10 +8,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 162b2eac45b0d2a0c2861243935d657fb1e9dc74..29cf9fd42d741b9f2510f1fe939534198ff7a85f 100644 (file)
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -8,10 +8,12 @@
        >
 
        <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_USER_LOGIN_EDIT_USER_DATA}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_EDIT_USER_DATA}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index b85c6661c0a1bd55cb200dfd14a5b318225c7e91..c8f9c836ba57c4c0135e072e4e0b1b9ef6fd68c9 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -8,10 +8,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_HOME}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index 4c8a651608b69e940e17990fa2c88a4669305b99..10efa9019996363d6e0a05843291eb9ec4b11115 100644 (file)
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index f0831d0bd1782e4fededc76025714536d6084b3b..91818480151eca2a0994ac5aa0e9df73f0bbbcde 100644 (file)
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -8,10 +8,12 @@
          >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_DATA_SAVED}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_USER_DATA_SAVED}" />
                </ui:define>
 
                <ui:define name="content">