]> git.mxchange.org Git - jfinancials-war.git/commitdiff
MOJARRA - Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 20 Aug 2017 18:29:37 +0000 (20:29 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 20 Aug 2017 18:40:45 +0000 (20:40 +0200)
- introduced own (still project-local) taglib for message template replacement
- now this is much shorter, down to only one JSF tag instead of 2-3 minimum

Signed-off-by: Roland Häder <roland@mxchange.org>
78 files changed:
web/WEB-INF/generic.jsf.taglib.xml [new file with mode: 0644]
web/WEB-INF/resources/tags/generic/messages/message_box.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/generic/messages/message_box_mini.tpl [new file with mode: 0644]
web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
web/WEB-INF/templates/admin/user/admin_user_links.tpl
web/WEB-INF/templates/input_fields/fax_input_fields.tpl
web/WEB-INF/templates/input_fields/landline_input_fields.tpl
web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
web/WEB-INF/templates/login/user/user_base.tpl
web/WEB-INF/templates/messages/message_box.tpl [deleted file]
web/WEB-INF/templates/messages/message_box_mini.tpl [deleted file]
web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl
web/WEB-INF/templates/user/user_profile_link.tpl
web/WEB-INF/web.xml
web/admin/business_contacts/admin_business_contacts_list.xhtml
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_export.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/contact/admin_contact_show.xhtml
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_edit.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_done.xhtml
web/guest/user/user_resend_link.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml
web/user/login_user_data_saved.xhtml

diff --git a/web/WEB-INF/generic.jsf.taglib.xml b/web/WEB-INF/generic.jsf.taglib.xml
new file mode 100644 (file)
index 0000000..68ac2a6
--- /dev/null
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2017 Roland Häder
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<facelet-taglib version="2.2"
+                               xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+       <namespace>http://mxchange.org/jsf/core</namespace>
+       <tag>
+               <tag-name>outputMessageBox</tag-name>
+               <description>This tag renders a style-able and customizable message for any kind of messages that the user should see.</description>
+               <source>resources/tags/generic/generic/messages/message_box.tpl</source>
+               <attribute>
+                       <name>message</name>
+                       <description>The message that should be place into the message box. You may also use EL code here that resolves to a message string.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>styleClass</name>
+                       <description>The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message.</description>
+                       <required>false</required>
+                       <type>java.lang.String</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputMessageBoxMini</tag-name>
+               <description>This tag renders a style-able and customizable mini message for any kind of messages that the user should see. It is similar to outputMessageBox tag but it renders a smaller box instead.</description>
+               <source>resources/tags/generic/generic/messages/message_box_mini.tpl</source>
+               <attribute>
+                       <name>message</name>
+                       <description>The message that should be place into the message box. You may also use EL code here that resolves to a message string.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>styleClass</name>
+                       <description>The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message.</description>
+                       <required>false</required>
+                       <type>java.lang.String</type>
+               </attribute>
+       </tag>
+</facelet-taglib>
diff --git a/web/WEB-INF/resources/tags/generic/messages/message_box.tpl b/web/WEB-INF/resources/tags/generic/messages/message_box.tpl
new file mode 100644 (file)
index 0000000..c32fdf7
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+       <div class="message_box">
+               <div class="message_header">
+                       <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+               </div>
+
+               <ui:fragment rendered="#{not empty message}">
+                       <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}">
+                       <div class="errors para">
+                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+                       </div>
+               </ui:fragment>
+       </div>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/generic/messages/message_box_mini.tpl b/web/WEB-INF/resources/tags/generic/messages/message_box_mini.tpl
new file mode 100644 (file)
index 0000000..35cd54a
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+       <div class="message_box_mini">
+               <div class="message_header">
+                       <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+               </div>
+
+               <ui:fragment rendered="#{not empty message}">
+                       <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}">
+                       <div class="errors para">
+                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+                       </div>
+               </ui:fragment>
+       </div>
+</ui:composition>
index 1e5f856d9b811108b316493f86028823f3f7cb89..39a99437a96534c3037f6341e7408f072dfb9211 100644 (file)
@@ -35,7 +35,7 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminBusinessDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                                <f:validator validatorId="EmailAddressValidator" />
-                                               <f:attribute name="allowEmpty" value="true" />
+                                               <f:attribute name="allowEmptyEmail" value="true" />
                                        </h:inputText>
                                </div>
 
index 1fc03955bbf70f14f7ca10840f468326c4b55778..b172a81fcb724ee1510f1065c310be14368f9244 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.contact}">
                <div class="table_header">
index 8ee9b405bfbd94182d86cba1901b30a580cd7c05..ddc82a43a53c05f229b9be121574c22f0a50bde6 100644 (file)
@@ -6,6 +6,9 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para">
+               <h:outputText value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
+               <h:outputText value="allowEmptyRequiredData is empty" rendered="#{empty allowEmptyRequiredData}" />
+
                <fieldset class="fieldset" id="personal_data">
                        <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
@@ -19,6 +22,7 @@
                                <div class="table_right_medium">
                                        <ui:include src="/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl">
                                                <ui:param name="targetController" value="#{adminContactController}" />
+                                               <ui:param name="allowEmptyRequiredData" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
                                        </ui:include>
                                </div>
 
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                                <f:validator validatorId="EmailAddressValidator" />
+                                               <f:attribute name="allowEmptyEmail" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
                                        </h:inputText>
                                </div>
 
index e3cc014afba16a064480ac2d407d0f484e883fc5..b1e06064a442b7de709441a194e6b8af12a31576 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
        <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" />
index 532ef872ca3fe09b69f10f3b56b23477037f2cde..1a0deff86980b9430d7bd6ea4d277967a3d734f7 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
 
        <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">
index 42e0f26d2e761ccac58d3848d1e330c43aabbaab..037cac38b50982d42f6ec9fdd3b0722379ca7df7 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
                <ul class="mini_nav">
index 180ad4c0490d3a18d3409bccc208d7d19aa35cb6..c0198241e1592c442a4bbec3e5e3e7ac5f11d78b 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
index c3aa9fff539ccf33cc411e9a1acaa13a79f8c860..e1b74edd334c31a9f01b9c0d6366ad151695792d 100644 (file)
@@ -1,56 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+
+       <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
+               <div class="para">
+                       <fieldset class="fieldset" id="fax_data">
+                               <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
+                               </legend>
+
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       </div>
+
+                                       <div class="table_right_medium">
+                                               <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
+                                       </div>
+
+                                       <div class="table_right_medium">
+                                               <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
+                                                       <ui:param name="targetController" value="#{adminPhoneController}" />
+                                               </ui:include>
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </fieldset>
+               </div>
        </ui:fragment>
-
-       <div class="para">
-               <fieldset class="fieldset" id="fax_data">
-                       <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-               </fieldset>
-       </div>
 </ui:composition>
index d81e62cc6f3ec8127085c32617313bd390f71612..272ab53c3f123277e1fd80f5ffed9e2ba7371b1a 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
index 52cc1c225aba28977d3c978ee27b7ea172ae7133..f10df164f24a665bac9b605986f537926dba854f 100644 (file)
@@ -1,56 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+
+       <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
+               <div class="para">
+                       <fieldset class="fieldset" id="landline_data">
+                               <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
+                               </legend>
+
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       </div>
+
+                                       <div class="table_right_medium">
+                                               <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
+                                       </div>
+
+                                       <div class="table_right_medium">
+                                               <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
+                                                       <ui:param name="targetController" value="#{adminPhoneController}" />
+                                               </ui:include>
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </fieldset>
+               </div>
        </ui:fragment>
-
-       <div class="para">
-               <fieldset class="fieldset" id="landline_data">
-                       <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-               </fieldset>
-       </div>
 </ui:composition>
index 82b3ecf4706a689c175252e04ee9bbf69b17995c..ca57e430be16a513891218424770fc318ebe8cca 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
        <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" />
index 4e8b11b6a616b2c92db6802497814a3c7d8956ba..8a905c2c321565e9a49528f9a1d0c53254ec2259 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
 
        <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">
index 25b36dd3ed5139dd526d0ccff24ffb6561364f96..aa6a44e68351775aae77b3436c44e579d5e1f3c5 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
                <ul class="mini_nav">
index b48922898fdaf6473693d75cb00597d799087da4..036ba693dd0153c03809eda6cb74b1d67d7a9ff9 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
index 9f56cfa1f62a5e1431ffbc45e9d0d961e486f010..54898df38c16bdde6030af2fb6c02227e015930c 100644 (file)
@@ -1,72 +1,70 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <div class="para">
-               <fieldset class="fieldset" id="mobile_data">
-                       <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
-                       </legend>
+       <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
+               <div class="para">
+                       <fieldset class="fieldset" id="mobile_data">
+                               <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
+                               </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                               </div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       </div>
 
-                               <div class="table_right_medium">
-                                       <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
-                               </div>
+                                       <div class="table_right_medium">
+                                               <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
+                                       </div>
 
-                               <div class="clear"></div>
-                       </h:panelGroup>
+                                       <div class="clear"></div>
+                               </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
-                               </div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+                                       </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
-                                               <f:converter converterId="MobileProviderConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-                                       </h:selectOneMenu>
-                               </div>
+                                       <div class="table_right_medium">
+                                               <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
+                                                       <f:converter converterId="MobileProviderConverter" />
+                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+                                               </h:selectOneMenu>
+                                       </div>
 
-                               <div class="clear"></div>
+                                       <div class="clear"></div>
 
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:panelGroup styleClass="error_container" layout="block">
+                                               <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       </h:panelGroup>
                                </h:panelGroup>
-                       </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
-                               </div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+                                       </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
-                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-                               </div>
+                                       <div class="table_right_medium">
+                                               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+                                                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+                                               </h:inputText>
+                                       </div>
 
-                               <div class="clear"></div>
+                                       <div class="clear"></div>
 
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:panelGroup styleClass="error_container" layout="block">
+                                               <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       </h:panelGroup>
                                </h:panelGroup>
-                       </h:panelGroup>
-               </fieldset>
-       </div>
+                       </fieldset>
+               </div>
+       </ui:fragment>
 </ui:composition>
index 9580d1da71fd684df7238f3dccd03427cf671f2b..2519b588a8b3f4c98160dba29f72a37594aa9fd3 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}"
 
        <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" />
index fbcc22db3f277033b5b64b48642c32de6e82078f..8a022bd4a050ef8db934657339e9df403a5fc844 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
 
        <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">
index 0458bd9b0d3d74b5830ab9af06b61b9430acfc39..69d4688e56c1190122675e61cbfd7fa35fe5865b 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
                <ul class="mini_nav">
index 74042e47a17a8b8d77938f8f60ad893e5a764500..5f8e7edc31ab886c5a6bc92ad3d57d4979053c95 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty mode}">
-               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
-       </ui:fragment>
+       <generic:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" styleClass="errors" rendered="#{empty mode}" />
 
        <ui:fragment rendered="#{not empty mode}">
                <div class="para">
index d7c209c63a01635cc9f0fbff8facd6c13449aed0..6cb6f61ff97e47f8eb6e2c205ed2ea02d853a2e7 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.user}">
-               <ui:include src="/WEB-INF/templates/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
                <div class="table_header">
index 7849f34e25e50ddbf215503cd2d33d74e5a18033..015ad4ca4eca86d4fef42465aa7a59fb648b3540 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        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/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select right_space" id="faxCountry" value="#{targetController.faxCountry}">
index da4cb7937c5393a8e97f7dd5d125503c8674e4e8..e80ddeffefddbcf00f5ff3f9599f0efdd9270dbd 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        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/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.landLineCountry}">
index 1bfa5771e088a28590d194b3fd215b3d07d8600c..6a60fc2c0add440cbeb1fb184cbc93088cd77f0c 100644 (file)
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        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/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController}">
                <ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
-                       <ui:param name="targetController" value="#{adminContactController}" />
+                       <ui:param name="targetController" value="#{targetController}" />
                </ui:include>
        </ui:fragment>
 </ui:composition>
index 00c63b1cf7177b50b587460627b8009ba9b21875..0b1d21102481e0ff986ff2b157c6442850bbd701 100644 (file)
@@ -2,6 +2,7 @@
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
        </ui:define>
 
        <ui:define name="menu">
-               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box_mini.tpl">
-                               <ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBoxMini message="#{msg.USER_NOT_LOGGED_IN}" styleClass="errors" rendered="#{not userLoginController.isUserLoggedIn()}" />
+
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
diff --git a/web/WEB-INF/templates/messages/message_box.tpl b/web/WEB-INF/templates/messages/message_box.tpl
deleted file mode 100644 (file)
index 07c5b1e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <div class="message_box">
-               <div class="message_header">
-                       <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
-               </div>
-
-               <ui:fragment rendered="#{not empty message}">
-                       <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}">
-                       <div class="errors para">
-                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
-                       </div>
-               </ui:fragment>
-       </div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/messages/message_box_mini.tpl b/web/WEB-INF/templates/messages/message_box_mini.tpl
deleted file mode 100644 (file)
index e8e1c56..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <div class="message_box_mini">
-               <div class="message_header">
-                       <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
-               </div>
-
-               <ui:fragment rendered="#{not empty message}">
-                       <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}">
-                       <div class="errors para">
-                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
-                       </div>
-               </ui:fragment>
-       </div>
-</ui:composition>
index c09e757a35626dabdd7408d302ac08d33f5f583c..7e748eaae1df86d58b4a35d4dea35ae833a5f4f9 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        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/messages/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>
+       <generic:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select" id="personalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
index 47abe987c48c6da2a3f7b1bb1504424dd182b28d..aa275dce96523d9e0856267bfb6391b1be0c6aa9 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty user}">
-               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
-       </ui:fragment>
+       <generic:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" styleClass="errors" rendered="#{empty user}" />
 
        <h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
index c6c43310f859af406a25a1df8479a8937a7d8a91..24bc9644506580b634204285b28bdacad5ce04b3 100644 (file)
@@ -3,7 +3,12 @@
     <description>An application to handle all your receipts and do some calculation with it.</description>
     <display-name>JFinancials Application v1.0</display-name>
     <context-param>
-        <description>Project stage.</description>
+        <description>Generic custom JSF tags library</description>
+        <param-name>javax.faces.FACELETS_LIBRARIES</param-name>
+        <param-value>/WEB-INF/generic.jsf.taglib.xml</param-value>
+    </context-param>
+    <context-param>
+        <description>Project stage</description>
         <param-name>javax.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
index ab2de3f3e50f0c4936023348aa0c0f2953253490..1544f8354f11bca2a981d862d1efc6d8fb3472d1 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{businessDataController.allBusinessContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" styleClass="errors" rendered="#{businessDataController.allBusinessContacts().isEmpty()}" />
 
                <h:dataTable id="table_list_business_contacts" var="businessContact" value="#{businessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
                        <h:column>
@@ -55,9 +51,9 @@
                                        <h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_CONTACT_PERSON}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
+                               <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContactEmployee.employeeId}" rendered="#{not empty businessContact.companyContactEmployee}" />
 
-                               <h:link outcome="admin_assign_business_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
+                               <h:link outcome="admin_assign_business_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContactEmployee}" />
                        </h:column>
 
                        <h:column>
index e334721fbb5763f82263529e94e2c773c4c2180a..7cb4a54380b0d1db41f909f50229b0197d72d4d8 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -8,7 +9,7 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="table" layout="block">
index 41ed4f56dd9c735bb07267e28943dd0c7aa009f6..c6e61f720260b9e1b3e3a81eb01705cde73e7f1b 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="table_medium" layout="block">
index 942d44702f71858c9f251008117c112a3c4d5beb..93075510cfeb4a3252cd11c2f5fcb4d6e26188ea 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
 
                <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}">
index a7a5019658954398447cf5e651c5f4ed645688f6..22f3351053186585054cee760428864e3739acd5 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
 
                <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>
@@ -85,7 +81,9 @@
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
                                </div>
 
-                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
+                                       <ui:param name="allowEmptyRequiredData" value="true" />
+                               </ui:include>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index 60b6c5f3be667c367f78fe71b3fd82350ecf1370..fbf5e9ec04daee8d21fdf6a5c5ec225d91a1e4ac 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
                        <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
index 56743a079b0f412dc5ffc2bc65d87c8fbbbbb9d7..a2a8a8220ebf63ba72bc74570e7fb3298f71b3f4 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
 
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <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="#{adminContactPhoneController.phoneId}" />
index 906f4b9b45a4f76165aae051e8c24b1257b10ba3..94c48e0fdac8230f3372bdb7ab68f2c25a5440ce 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
 
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <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}" />
index 72ee0953e16184a9282c8b51b581ce72137fb89b..2cd08c4d025b91c9233e1b926cd6112d5e487259 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
 
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <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}" />
index 6da5063c3b7e373b6339b87b7abd59f86d0411ba..7d5b87701df8a80cb73da3009dd0ddb01c181c56 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
        </ui:define>
 </ui:composition>
index 5cfe15ff92ccba79c73543618fd85d4869c8476a..bfe59db3271db3f0101e78f994160dd8bfab323f 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
        </ui:define>
 </ui:composition>
index 1df83790245fbf55ac1f690f5a87c2d003e19b49..19288fadbc5bfece010d71181f133350b23a52b8 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:column>
                </h:dataTable>
 
-               <ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" styleClass="errors" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
        </ui:define>
 </ui:composition>
index 4dccd2f304c857a329b9c812bae427d424f8d79d..8d736fe59c0e8d242406dc950bb24d1ead925afe 100644 (file)
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                       <ui:param name="isShowPage" value="#{true}" />
+                       <ui:param name="isShowPage" value="true" />
                </ui:include>
 
                <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
index 486ff2d7e97bec437feb0c99224401fdc56a76c0..e20e35236c42c34a62c731931b202845d00efe04 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
        </ui:define>
 </ui:composition>
index 969a36fa8fffdd3eb7e7732d0d7a44db884a1525..110bf2f854add93b1ac3f0bae3c14b02b10388f7 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
        </ui:define>
 </ui:composition>
index 426230c8209dd3bafcea2adcff085fd76997aa84..60099faee0142834a562d942be78a8b12749dee4 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:column>
                </h:dataTable>
 
-               <ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" styleClass="errors" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
        </ui:define>
 </ui:composition>
index 96a05af0acf1fd768c2ef55ef7ece95be88e196b..f26e2f21c0d5ec032cd0038ea9ef1293c71e807d 100644 (file)
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                       <ui:param name="isShowPage" value="#{true}" />
+                       <ui:param name="isShowPage" value="true" />
                </ui:include>
 
                <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
index a7b54554665dd4394670350a6869f1ac03791abb..add75c9404731cda4e99b3a787ee3138f971291c 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
        </ui:define>
 </ui:composition>
index c5c6c1fa8889fbb422014f346e03ab0c59428255..578d1da1c0529fe972385908b331d9c5afbe9848 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
        </ui:define>
 </ui:composition>
index e6bedf9a60fe7a5efbe7c501759c34c884780372..54cad1feca1ddb2e9f16d5bc31ddabfdca73fefb 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:column>
                </h:dataTable>
 
-               <ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_LIST_MOBILE_EMPTY}" styleClass="errors" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
        </ui:define>
 </ui:composition>
index 6c050819a9572ac27eab2345c2d9d2d5c530d935..23d480fdf348bb818c4f92b8311fd6746e64bcaa 100644 (file)
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                       <ui:param name="isShowPage" value="#{true}" />
+                       <ui:param name="isShowPage" value="true" />
                </ui:include>
 
                <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
index 6991e52c622832567a5104c9fda18af7de8aff3a..6ad32da28914a094258abdd0834601845311314d 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
                        <h:column>
index b95f567a1109c434704d0a01bca34d10d6a23a7a..f9846079470e951de69b83a32c142027aba9a21d 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
                        <h:panelGroup styleClass="table_medium" layout="block">
index e6602eeb288c64ba72929a4945d53fb06c48f247..c1c0e130082a2876eb6a8a85c05c066f3b928130 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
                        <h:panelGroup styleClass="table_medium" layout="block">
index db18fe83e65270145ced397cf74f01de326ecaee..f9d9310d1025c39fb5317974798dbfa6db44c183 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
 
                <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}">
index 74267d9169ca36fbd037af7a93425a4c6d88ef6d..05707fae81fa28a2402078b38767ad520a1967b0 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
 
                <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>
index 0f1e7b0eef383b294a11b37db52c0da3130e863b..022c6136e68b95202b10127fcaa140991f46ef07 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                        <h:panelGroup styleClass="table_medium" layout="block">
index aab5e8e6ab4cbe7a6ab25cc8d80c6b2388625289..79ed9ff86852aa10c77d11b2fc50e7a2759ea817 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
                        <h:panelGroup styleClass="table_medium" layout="block">
@@ -48,7 +44,7 @@
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-                                       <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
+                                       <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
                                </div>
                        </h:panelGroup>
                </h:form>
index 02c2dddc24aff25ba1ec35f78f31985bdb0922dc..3e6f6916439ed366be43ac9a7ad22b3f9f195f64 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
index 074c56d1ce87e29aa28601002a52bdd707603f40..9c97e6d71264b1c19cbbd744efac3fdbf2431ea8 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <h:panelGroup styleClass="table_medium" layout="block">
index da804aa4f528ea01abe4bdd1740b999fcf6cb0cd..8087512fdc2169a0dd33a85b49081df12727aa87 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                                </h:panelGroup>
                        </h:panelGroup>
 
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+                       <generic:outputMessageBox message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" styleClass="errors" rendered="#{empty beanHelper.user}" />
                </ui:fragment>
 
-               <ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" styleClass="errors" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>
index ba45e295d204b16476814772cdfe5663da64da48..3acd1fd5ae9c00858985534007a14900451e88e5 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:dataTable>
                </h:panelGroup>>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
        </ui:define>
 </ui:composition>
index 55e02a4c3760b7dc9d18ae51a1b5730e223948fd..4d10f91cade9162d70442f04e4b1fbce627cd24d 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
        </ui:define>
 </ui:composition>
index a68301a6cf92391687a030fe64666b60b93b9fba..6097ba39671f13a02b339b7dc98b041f12461243 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -15,7 +16,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-                       <div class="para" id="user_lost_password_content">
+                       <div id="user_lost_password_content">
                                <h:form id="form_lost_password">
                                        <h:panelGroup styleClass="table" layout="block">
                                                <div class="table_header">
@@ -54,7 +55,6 @@
 
                                                                <div class="clear"></div>
                                                        </h:panelGroup>
-
                                                </fieldset>
 
                                                <div class="table_footer">
                        </div>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
        </ui:define>
 </ui:composition>
index 34296e01bb31f34cd2fb48331020de4dedbf3543..8d92dbb5cea8aec7542090c802b0e01db47d15f4 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -8,7 +9,7 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
                                <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+                       <generic:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" styleClass="errors" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                <div align="center">
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
                                                </f:facet>
+                                               <!-- @TODO Unfinished -->
                                        </h:panelGrid>
                                </div>
                        </ui:fragment>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" styleClass="errors" rendered="#{not userController.isPublicUserProfileEnabled()}" />
        </ui:define>
 </ui:composition>
index 792cf67807b1fe4c32f259ebb4d45b89fd00abdf..e3492f8e81875aa0b26dac6d9f569d7dfaaeddf8 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
 
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" styleClass="errors" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
        </ui:define>
 </ui:composition>
index 2c98260810f4bbcad3e56182709943833c1c4be0..4f946eefd9fe14ad26b0e93e9ff79d1000dc6f06 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,6 +15,8 @@
        </ui:define>
 
        <ui:define name="content">
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <div class="para">
                                <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl" />
                        </h:panelGroup>
                </ui:fragment>
-
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
index f291735a2ed0c23eaf9ac7e5ef38213a83796605..917d14c24a7ecfb4a5deb983a7846f18e9370988 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,8 +15,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                       <ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
-               </ui:include>
+               <generic:outputMessageBox message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
        </ui:define>
 </ui:composition>
index 92742a6953d4ad16da4f3561e873027b3374657c..6686887a9e036ef2b2d448881ed7d8da51caaa03 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:panelGroup>
                </h:form>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
        </ui:define>
 </ui:composition>
index 170e5fcb20c09c6c9adc30df56a8818139c07dad..02a0006159678a70c7b914f2210b52fa0fb41837 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+
+               <generic:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <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 userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>
index 6ddb2373e39985f1fb24a9b90d64c13676f2e8a0..22fa37c0d834c2dc730857c27f127b701a3f87c9 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 36821750860c3517da3aeb557c1f691c126c8b7d..51fbabae2f0600d01c72587dd46717ba03555828 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,6 +15,8 @@
        </ui:define>
 
        <ui:define name="content">
+               <generic:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+
                <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
                        <div class="table_header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                        </h:form>
                </h:panelGroup>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
-
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>
index 7eddb313727d689ba794486d917d845cc3756e0b..f5cf8969912e91c2df8b6e0fea160b7ee8929c87 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
                        </h:panelGroup>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 18b8be0d639899656650cae6d678100b9a8dc373..5794b68a829c6390f44303543396e7a976f6c28a 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
                        </h:form>
                </h:panelGroup>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                       <ui:include src="/WEB-INF/templates/messages/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>
+               <generic:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
index 047c2649738f26cdd93dfc747c96d93989ae6e29..8384359b0fc70f51472216c99cfd97a502778a07 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+
+               <generic:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
                </ui:fragment>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                       <ui:include src="/WEB-INF/templates/messages/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" />
                </ui:fragment>
index aa7c60622411156572cd6e9dd62c2b24a5d8addc..7324ebb0e5300a155c8ef6bf857164158a4bad02 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:generic="http://mxchange.org/jsf/core"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                       </ui:include>
-               </ui:fragment>
+               <generic:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />