Please cherry-pick:

- converted h:outputText (simple output) into a nicer message box

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

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
index 312e437c5b4be615ad05a53fadd2b403d00d910f..a5d91955023bef8c56b4a5855c17fd55bde82bed 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.contact}">
                <div class="table_header">

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
index 257f24045cb3429653baad9977bdfac7c03c84d3..21f97818488e1750dd1833cc424bdfbab6716438 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
index 3f3e22f18db16ccfd8996acede2d6b4839d68a01..722304767bfaa949044a509a471dadc70865583e 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
                <f:facet name="header">

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
index 1b6bb5b58402c59f869f7dc2bb70bdb2f50f129c..61e466e12d97917ba2ff8c2eb5f70c7636ea281f 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
                <ul class="mini_nav">

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index b350fa7552d5de3af7714d5e8f3c786f923ba808..ceaa95269eccb9c062b81090dd8a0d691a5beeca 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index ac03e7d947f2c0d97df38b93ab5cab57a4e0544a..c2137c0ffabba40558645112c5525b1b60b0d233 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <div class="para">
                <fieldset class="fieldset" id="fax_data">

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index b42fab6ed47e33849d95f8b650d0ca0f1df3f4e0..b110d8ae967048c81448d1f76438a3caa52a771c 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index ac54e9722ea4b5193991271a98c3fb5642c6924a..a560cac7506ffb76dc4a399668514e0628d8e4de 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <div class="para">
                <fieldset class="fieldset" id="landline_data">

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 35fc34d3c98045a1225cd735209a10c6d3ac663a..4ed5e6008d9b6c536dd155ccaacde98b937c4a16 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index 8b7c5a03150237b14ced44df90ced03e2e3a6fc4..45d494ecf7e668b1c65f593261b7457d7776984b 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
                <f:facet name="header">

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index cd5c60a7f96739d992563f7eeea3a3a8a3d8d5e0..6ffb7660ec53283799f59c77c63539c967be4fa4 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
                <ul class="mini_nav">

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index cb686076b6b03ff057e9d54d1707e192634d9ed6..b6c73ff0f0f23b581c30b7de24de3492308b229c 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index 742cc4a2d5add3ab443f549581f7a76a04bce947..ff56323e8ea5efc34988fc8a0f8c08c77c228af9 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <div class="para">
                <fieldset class="fieldset" id="mobile_data">

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
index 82e5c6978ba05c8cb539f743c9f34266a6cf41cf..de0dd7e7ccc349e03a9596ab90666fea623f664a 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <ui:fragment rendered="#{empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index f7648aab9ca23e87c902ec9fdf67fd36b57124c5..95cfde3f5d5a97b9c86dc9e3129ea9ec9268fe35 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
                <f:facet name="header">

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
index 18fcec5b9b144a4fdb56b1d6d2fd49a18bc4a8b1..33d5ed3a951cef76df99079a4fd0ceba7f40a479 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
                <ul class="mini_nav">

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index a5308ed852bd0cdef991827c7e9a53a4bfb8af6d..20adfba3c0fd9a9b5fb53ca86143298aa26455a5 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
+       <ui:fragment rendered="#{empty mode}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{not empty mode}">
                <div class="para">

diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index 180cc90b5aabda3d149c9a16c48679f3d1a70fa5..a00b77df71335ecda06d2b3d393e8ad045e096f3 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" rendered="#{empty beanHelper.user}" />
+       <ui:fragment rendered="#{empty beanHelper.user}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
                <div class="table_header">

diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index dfa9efcb4f43000e18e5e5e0482033368c01b13c..5292c5b88e8ba4aa2187e61217e038fb8f8f2c61 100644 (file)
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -5,12 +5,17 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+       <ui:fragment rendered="#{empty targetController}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
+
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}" required="#{featureController.isFeatureEnabled(targetController.controllerType + '_gender')}" requiredMessage="#{msg.FIELD_GENDER_REQUIRED}">
                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
                        <f:selectItems value="#{genderController.selectableGenders}" var="gender" itemValue="#{gender}" itemLabel="#{msg[gender.messageKey]}" />
                </h:selectOneMenu>
        </ui:fragment>
-
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>

diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
index e4cad0f78a52e01b7fe903d559b093c131853e57..07c5b1e412f980807fd594b58382b46e143277a8 100644 (file)
--- a/web/WEB-INF/templates/generic/message_box.tpl
+++ b/web/WEB-INF/templates/generic/message_box.tpl
@@ -12,9 +12,17 @@
                </div>
 
                <ui:fragment rendered="#{not empty message}">
-                       <div class="okay para">
-                               <h:outputText value="#{message}" />
-                       </div>
+                       <ui:fragment rendered="#{not empty styleClass}">
+                               <div class="para">
+                                       <h:outputText styleClass="#{styleClass}" value="#{message}" />
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{empty styleClass}">
+                               <div class="para">
+                                       <h:outputText styleClass="okay" value="#{message}" />
+                               </div>
+                       </ui:fragment>
                </ui:fragment>
 
                <ui:fragment rendered="#{empty message}">

diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index 0dd972a2a49c857a2dbd7a50bace4d5021542bb9..12552ce7a91059046cdec95ceb79f3b164b60a88 100644 (file)
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -5,6 +5,13 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+       <ui:fragment rendered="#{empty targetController}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
+
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select right_space" id="phoneCountry" value="#{targetController.phoneCountry}">
                        <f:converter converterId="CountryConverter" />
@@ -20,6 +27,4 @@
                        <f:validator validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>
-
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>

diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
index 4ce34ff6ea60bca790db406f2f17e83cf9a6d434..536bfecc54aa2f5d3942f8ba6374dd248cba0315 100644 (file)
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -5,6 +5,13 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+       <ui:fragment rendered="#{empty targetController}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
+
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
                        <f:converter converterId="CountryConverter" />
@@ -20,6 +27,4 @@
                        <f:validator validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>
-
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>

diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index 8307a1003d909da7c6705525b3904a655d7268dd..4ed663573c4d04b15fda6d046ed06f519413e03f 100644 (file)
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -5,6 +5,13 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+       <ui:fragment rendered="#{empty targetController}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
+
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
                        <f:converter converterId="MobileProviderConverter" />
@@ -16,6 +23,4 @@
                        <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>
-
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index f394ec0d6213a032139070bce4b628df0706f8ab..8fc3f32c6ee53c7252e1e46b3861b3824f66014c 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -14,7 +14,10 @@
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
                </ui:fragment>
        </ui:define>
 

diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
index 6188f9c13999b6f7babb488bba3436e07f9fa037..e85accf1ecdaf6ac77163db9da8ee70f7a3a26c9 100644 (file)
--- a/web/WEB-INF/templates/user/user_profile_link.tpl
+++ b/web/WEB-INF/templates/user/user_profile_link.tpl
@@ -5,7 +5,12 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="notice" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
+       <ui:fragment rendered="#{empty user}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index a7bc592c2c7b1819e5ab8e4e29217c3c83c2a51a..9707352b0c19dc47617277158793d3af15eff698 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -24,7 +24,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+                       <ui:fragment rendered="#{empty beanHelper.contact}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <h:panelGroup styleClass="table" layout="block">

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index cfe2f73561a174a9aa99df9a1c992ef7fce415fb..000a0b7d90164344876e5393ff3024c01408114f 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -24,7 +24,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+                       <ui:fragment rendered="#{empty beanHelper.contact}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <h:panelGroup styleClass="table_medium" layout="block">

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index ae78b819fc60fd5de776ee76cb4c6e5e2544ec8e..3f442a3e142736dcab505c7bda2b4003c8fbb57f 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -18,8 +18,15 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_export_contacts">
-                               <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
+                       <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
+                               <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
                                        <p:column exportable="false">
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 6e6879cceb45d0c3df038474224f4a7345b0c901..4e9467b57b331cbda25c06892c2c22f82a667dc4 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -17,7 +17,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}"rendered="#{userController.allUsers().isEmpty()}" />
+                       <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
                                <h:column>

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index ed1ce5359b03a6b42b8dd113a3cc872741520651..b8368b89f667a6f77f67a76db9f7f6fc6554e2df 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -24,7 +24,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+                       <ui:fragment rendered="#{empty beanHelper.contact}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 348a479deb6909a37cc573c63121abefc1912cfa..92b938f35a96e3ead4b53049c6e494e11fd15e6f 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -54,9 +54,19 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+                       <ui:fragment rendered="#{empty beanHelper.contact}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
                                <f:param value="#{beanHelper.faxNumber.phoneId}" />

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 933d7e71d91e2a1314c2f0134c59d5ee7facbd2f..83c4aec9788d3c9b74ffe59f2eb83510d7754e51 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -54,9 +54,19 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+                       <ui:fragment rendered="#{empty beanHelper.contact}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 417485ac76adef36144a0840a4e4985e9dd6f8a6..ef2a67d5bc6158607a90a8abd75142ebf3b3411a 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -54,9 +54,19 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+                       <ui:fragment rendered="#{empty beanHelper.contact}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
                                <f:param value="#{beanHelper.mobileNumber.phoneId}" />

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index d16f48864259cc144cc1cc19549b0abab8eb5360..6c5759411b1b0caeecb6503bfb6858d3d67f98a3 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -46,7 +46,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index df0026291657383e3f8bb7bbad86cd0a5c78fe6b..984dcfe2783c991da894b312a7aec9abc6ce1a4c 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -41,7 +41,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index ee4f4ceb3187f30ca6248ed5ce995b98cdf8dadb..2f621cc476ffa06ee3ccde27e2cca4de4ab1cac7 100644 (file)
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -58,7 +58,12 @@
                                </h:column>
                        </h:dataTable>
 
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+                       <ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 193d26b7c5742b816ca955d0b84f2479028c755e..a3a1bbba9925334d888acf0a35d4a814133c1b52 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -46,7 +46,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 0cd4560ea73b5ec10905015294f8d57ec81ecea1..ce87dc5787871902a6efdc5ec5cdb05adf28f648 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -41,7 +41,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index f03f6baefd33c010bd3083f93b7741158706f341..354478e69cd3b8989551daab26c6d170cf77d585 100644 (file)
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -58,7 +58,12 @@
                                </h:column>
                        </h:dataTable>
 
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
+                       <ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 401efee601d87b2a41ccf159a568c111413cf48d..de23aa3f3007d864b1f63a5dbab42c80e515cc6c 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -46,7 +46,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index f8062a1fc29443edb7f1c822aacabd443c1fcca0..88328ed08e4fedc177e8c14915a9b8b40b3e525d 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -41,7 +41,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 54b1fc6ba0315cd4490fafd844465936374bc9bc..6c4dcad19bdbdc30660326ce6f36999696462518 100644 (file)
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -69,7 +69,12 @@
                                </h:column>
                        </h:dataTable>
 
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
+                       <ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 7ae2cb457c02cfcaccc27ed48933ee3d3146d8c7..b2e157aabebb3966be1deac41addfaf64fb75d91 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -24,7 +24,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        Here goes your content.
                </ui:define>

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 67917375e9a317bccbabd1b8921c84440e546ae0..cdb343e0f84cd5aac7b0f1783f13cdfa9dfd9963 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -25,16 +25,21 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
                                <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
-                                               #{msg.ADMIN_EDIT_USER_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index dab2e8f172a467aba811d06a3a3f6f4f4253fc77..49638be8c2d56d0aaa5915ed8e59073e77a41554 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -17,8 +17,15 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_export_users">
-                               <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{not userController.allUsers().isEmpty()}">
+                       <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
+                               <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
                                        <p:column exportable="false">
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 4d348cdd43a7c5fb36c7a9a5bac00cd7926e1d4d..6f1a07e1bb2b433a8842f53513355caa9da0e5e0 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -17,7 +17,10 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_LIST_EMPTY}"rendered="#{userController.allUsers().isEmpty()}" />
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
 
                        <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
                                <h:column>

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 39977d141e54c5013ddebb3ec210298a1bbacb14..548f8898038e9d3d50d2662da9ee24b40c83cbc3 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -25,7 +25,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                                <h:panelGroup styleClass="table_medium" layout="block">

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index e96b16010aa385f2cede8afe0e4eee8dfc9e4c62..cbe6b44a82b5281f139efc43cb67ec6415d6ce89 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -24,7 +24,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 6963266e3e505c83606947e6941b20d69163389e..95e4cca6389b65497eb55530451bf39ec6123fcf 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -24,7 +24,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
                                <h:panelGroup styleClass="table_medium" layout="block">

diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
index 0fde6a06ed072d6560b60bf8987ebc1fc27df4a9..f394d378bc16880b919d9c58bd216f2b756426c4 100644 (file)
--- a/web/guest/user/confirm_account.xhtml
+++ b/web/guest/user/confirm_account.xhtml
@@ -39,11 +39,19 @@
                                        </div>
                                </h:panelGroup>
 
-                               <h:outputText styleClass="errors" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" rendered="#{empty beanHelper.user}" />
+                               <ui:fragment rendered="#{empty beanHelper.user}">
+                                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                               <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
+                                               <ui:param name="styleClass" value="errors" />
+                                       </ui:include>
+                               </ui:fragment>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
-                               <h:outputText styleClass="errors" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 0e7102760989da4badbaa83f7d39674c6a70b22d..1419666b1321f84ea9626b84cc7d8a4cc250955d 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -38,7 +38,10 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index d7db1d1266827f04da321d69c8956cd501034c70..2d6a6a06272a634d166a0e43ba7049fa5fabdbc1 100644 (file)
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -70,7 +70,10 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
index 1bf51168c75e3e0d122356e7d8ee79e0ef3cc222..340b6981c2f9c9f13f580c35225b85c32882b202 100644 (file)
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -40,7 +40,10 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml
index 4737d08770b89212fdde4f4f678ea1354041ebeb..35557e623af211f846a559ad7e13cd2342aa8a5f 100644 (file)
--- a/web/guest/user/register_page2.xhtml
+++ b/web/guest/user/register_page2.xhtml
@@ -32,7 +32,10 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index da489ba5bdf9aae980e2d892f8ea66ea7bfc51cb..b1fc24bfbb201832e8f9ac060658fb30f1d61f54 100644 (file)
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -56,13 +56,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <<<<<<< HEAD
-                       <ui:fragment rendered="#{not registerController.isResendConfirmationLinkEnabled()}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
-                       =======
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
-                       >>>>>>> de7e9f0... Continued a bit: (please cherry-pick)
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index c07179adeb958a5b844622e8e1fc60ed0d66c57f..38fcfdbcd35e3b3270ca6dbce8bd6c84917c609d 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -36,7 +36,12 @@
                                </h:dataTable>
                        </h:panelGroup>>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_LIST_DISABLED}" rendered="#{featureController.isFeatureEnabled('user_list')}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 5428ccd4109b303fed0af18202c538e3275ea263..55f8af2a73dcc4984b0f0ea77335f67ae13d98dc 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -34,7 +34,12 @@
                                        <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
                                </ui:fragment>
 
-                               <h:outputText value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+                               <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
+                                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                               <ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
+                                               <ui:param name="styleClass" value="errors" />
+                                       </ui:include>
+                               </ui:fragment>
 
                                <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                        <div align="center">
@@ -48,7 +53,10 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 551dcc80addedfb5587ca6d8653d0ccd10c39ace..2e17a3a84f680c0a09d0fc03629086b6ba9f3b6a 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -54,7 +54,12 @@
                                </h:form>
                        </h:panelGroup>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('edit_user_data')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                                <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index fc370b845afd1a2bd5e2e22aae93f5f520890966..254d07c8b8962e4984dd63684f9359d89d0d4934 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -90,7 +90,12 @@
                                </h:panelGroup>
                        </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />

diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index 75590cdf4cd76996342faa8b365f205a53a03d74..17760ecb9f9af210fa1fae0f190b30b550256921 100644 (file)
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -36,7 +36,12 @@
                                </h:form>
                        </h:panelGroup>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('edit_user_data')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                                <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index d2b1e88cfc3707dcfa5948e2fac52f4979c58c4b..75d6b04d20cc179d099e19474978acb90bd1264a 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -27,7 +27,12 @@
                                <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
                        </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('edit_user_data')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />