Please cherry-pick:

- renamed JSF views with "contact_business" to "business_data"
- moved selection boxes to own template folder "selection_boxes"
- renamed + moved locale_selection_box.tpl to widgets/locale_change_widget.tpl
- renamed "generic" templates folder to "messages"
- TODO: moving out "country selection box" to a template can be done:
  + for each type, land-line and fax number have a separate template
  + the target controllers must all then have same naming, e.g. landLineCountry

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

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index d6a66e088d8f11042af85ce4367879e22cef2324..524ae373132f9fc5ec7541a72681f9e8fe540829 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -109,12 +109,12 @@
                        <to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_list_contact_business</from-outcome>
-                       <to-view-id>/admin/contact_business/admin_contact_business_list.xhtml</to-view-id>
+                       <from-outcome>admin_list_business_data</from-outcome>
+                       <to-view-id>/admin/business_data/admin_business_data_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_export_contact_business</from-outcome>
-                       <to-view-id>/admin/contact_business/admin_contact_business_export.xhtml</to-view-id>
+                       <from-outcome>admin_export_business_data</from-outcome>
+                       <to-view-id>/admin/business_data/admin_business_data_export.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_user</from-outcome>

diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 12d3bb233a2780f30d3cf3393c67c458e1ecfc75..05270cc256ef87e399a443c12910b0bd5db04da2 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -39,8 +39,8 @@
                                </div>
 
                                <ul>
-                                       <li><h:link title="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS_TITLE}" outcome="admin_list_contact_business" value="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS}" /></li>
-                                       <li><h:link title="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS_TITLE}" outcome="admin_export_contact_business" value="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS}" /></li>
+                                       <li><h:link title="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS_TITLE}" outcome="admin_list_business_data" value="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS}" /></li>
+                                       <li><h:link title="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS_TITLE}" outcome="admin_export_business_data" value="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS}" /></li>
                                </ul>
                        </ui:fragment>
 

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
index dc8195a6680ef23f52e8b767c6708c7b69a1196d..1fc03955bbf70f14f7ca10840f468326c4b55778 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 7ab91ab7dfd198289683031968929950ffe03823..a862af19f9cfab99f7ed8f2bd0e4d7e96cc2184c 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -17,7 +17,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
+                                       <ui:include src="/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl">
                                                <ui:param name="targetController" value="#{adminContactController}" />
                                        </ui:include>
                                </div>
@@ -235,15 +235,9 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{adminContactController.mobileProvider}">
-                                               <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>
-
-                                       <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminContactController.mobileNumber}">
-                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
+                                       <ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{adminContactController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
index 21f97818488e1750dd1833cc424bdfbab6716438..e3cc014afba16a064480ac2d407d0f484e883fc5 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
index 722304767bfaa949044a509a471dadc70865583e..532ef872ca3fe09b69f10f3b56b23477037f2cde 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
index 33c33bcf02188c8ae284b5999f7fa789346d7867..42e0f26d2e761ccac58d3848d1e330c43aabbaab 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index df6fefcd984a4070010f72bb9beb18f7f4d6c7b4..180ad4c0490d3a18d3409bccc208d7d19aa35cb6 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 2665a383047b3c4ce9bb95bf8f4f7c03f48a2267..c3aa9fff539ccf33cc411e9a1acaa13a79f8c860 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 22134c7d93f7c87d5539890fbd90eb2d3de1ed9c..d81e62cc6f3ec8127085c32617313bd390f71612 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index 0e721a163e4651de5bf46b1d9c9663aa462260df..52cc1c225aba28977d3c978ee27b7ea172ae7133 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 4ed5e6008d9b6c536dd155ccaacde98b937c4a16..82b3ecf4706a689c175252e04ee9bbf69b17995c 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index 45d494ecf7e668b1c65f593261b7457d7776984b..4e8b11b6a616b2c92db6802497814a3c7d8956ba 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index 4292e6ddfbfde0f955deaffebb5616861ae344f2..25b36dd3ed5139dd526d0ccff24ffb6561364f96 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index 0371fcd6a45b287a6856e2d9b34cf0001833eca6..b48922898fdaf6473693d75cb00597d799087da4 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index 6066cbec06d7f6f0a1718e484d258e454aae0ee0..9f56cfa1f62a5e1431ffbc45e9d0d961e486f010 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
new file mode 100644 (file)
index 0000000..9580d1d
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       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>
+
+       <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" />
+       </ui:fragment>
+
+       <ui:fragment rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
+               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
+       </ui:fragment>
+</ui:composition>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index f579fab23a4f6111e92d2f88ff19d835399784a1..fbcc22db3f277033b5b64b48642c32de6e82078f 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
index 48d218af05a02039aba60060393418c059be3ee7..0458bd9b0d3d74b5830ab9af06b61b9430acfc39 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index cc7ce2daac4f20a76ad33650a43c249e2549a8d6..e91047b4f5750b39e53e07c9f3c4a9e217ed85b9 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty mode}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index f5855475670d6cf31d3a796ac4daa36e30678205..d7c209c63a01635cc9f0fbff8facd6c13449aed0 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty beanHelper.user}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 1436d3796850adb16928b7ffe174a01b59553380..e2e8f20aacd0bf73eb2066590c639b225523bb47 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -46,7 +46,8 @@
                                                <ui:insert name="menu">
                                                        <h:outputText value="Default menu" />
                                                </ui:insert>
-                                               <ui:include src="/WEB-INF/templates/generic/locale_selection_box.tpl" />
+
+                                               <ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
                                        </div>
 
                                        <h:panelGroup id="content_outer" class="left_content" layout="block">

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 2191eb14da69de73f751cc2a70e3133564141e85..70d24b8d5f1c1f4aa7c30035e97154e61398eef9 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -22,7 +22,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
+                                       <ui:include src="/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl">
                                                <ui:param  name="targetController" value="#{contactController}" />
                                        </ui:include>
                                </div>
@@ -266,15 +266,9 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{contactController.mobileProvider}">
-                                               <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>
-
-                                       <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{contactController.mobileNumber}">
-                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
+                                       <ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{adminContactController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
@@ -295,7 +289,7 @@
                                        </div>
 
                                        <div class="table_right_medium">
-                                               <ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
+                                               <ui:include src="/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl" />
                                        </div>
 
                                        <div class="clear"></div>

diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl
deleted file mode 100644 (file)
index c4b41bc..0000000
--- a/web/WEB-INF/templates/generic/locale_selection_box.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:form>
-               <h:panelGroup layout="block" styleClass="locale_selection_container">
-                       <h:panelGroup layout="block">
-                               <h:selectOneMenu styleClass="select" value="#{localizationController.localeCode}" onchange="submit()">
-                                       <f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
-                               </h:selectOneMenu>
-                       </h:panelGroup>
-
-                       <h:commandButton styleClass="submit" type="submit" action="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
-               </h:panelGroup>
-       </h:form>
-</ui:composition>

diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
deleted file mode 100644 (file)
index 07c5b1e..0000000
--- a/web/WEB-INF/templates/generic/message_box.tpl
+++ /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/generic/message_box_mini.tpl b/web/WEB-INF/templates/generic/message_box_mini.tpl
deleted file mode 100644 (file)
index e8e1c56..0000000
--- a/web/WEB-INF/templates/generic/message_box_mini.tpl
+++ /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>

diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
deleted file mode 100644 (file)
index 56be7e9..0000000
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       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="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
-                       <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>
-
-               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
-                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-               </h:inputText>
-       </ui:fragment>
-
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>

diff --git a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl b/web/WEB-INF/templates/generic/personal_title_selection_box.tpl
deleted file mode 100644 (file)
index 7cd411b..0000000
--- a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       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/generic/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
-       </ui:fragment>
-
-       <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select" id="personalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
-                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-                       <f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
-               </h:selectOneMenu>
-       </ui:fragment>
-</ui:composition>

diff --git a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
deleted file mode 100644 (file)
index 680c63e..0000000
--- a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
-               <f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
-       </h:selectOneMenu>
-</ui:composition>

diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index 12552ce7a91059046cdec95ceb79f3b164b60a88..ef3ec8cc1afbd61dbd420fbb063ee49c85420833 100644 (file)
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty targetController}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
index 536bfecc54aa2f5d3942f8ba6374dd248cba0315..b8ae8946eb02f45ef64f54fad938bc84842f65dc 100644 (file)
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty targetController}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index 4ed663573c4d04b15fda6d046ed06f519413e03f..1bfa5771e088a28590d194b3fd215b3d07d8600c 100644 (file)
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -6,21 +6,15 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty targetController}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>
 
        <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
-                       <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>
-
-               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-               </h:inputText>
+               <ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+                       <ui:param name="targetController" value="#{adminContactController}" />
+               </ui:include>
        </ui:fragment>
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index f398c0f28756a05e9955c5109e5b1921c12f3580..00c63b1cf7177b50b587460627b8009ba9b21875 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -15,7 +15,7 @@
 
        <ui:define name="menu">
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
+                       <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>

diff --git a/web/WEB-INF/templates/messages/message_box.tpl b/web/WEB-INF/templates/messages/message_box.tpl
new file mode 100644 (file)
index 0000000..07c5b1e
--- /dev/null
+++ b/web/WEB-INF/templates/messages/message_box.tpl
@@ -0,0 +1,34 @@
+<?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
new file mode 100644 (file)
index 0000000..e8e1c56
--- /dev/null
+++ b/web/WEB-INF/templates/messages/message_box_mini.tpl
@@ -0,0 +1,34 @@
+<?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>

diff --git a/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl
new file mode 100644 (file)
index 0000000..56be7e9
--- /dev/null
+++ b/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       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="#{not empty targetController}">
+               <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
+                       <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>
+
+               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+               </h:inputText>
+       </ui:fragment>
+
+       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>

diff --git a/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl
new file mode 100644 (file)
index 0000000..c09e757
--- /dev/null
+++ b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       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>
+
+       <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}">
+                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+                       <f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
+               </h:selectOneMenu>
+       </ui:fragment>
+</ui:composition>

diff --git a/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl
new file mode 100644 (file)
index 0000000..680c63e
--- /dev/null
+++ b/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
+               <f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
+       </h:selectOneMenu>
+</ui:composition>

diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
index 1ddb6de71bab2ba4eb7c6ab2051f25245f062fcf..47abe987c48c6da2a3f7b1bb1504424dd182b28d 100644 (file)
--- a/web/WEB-INF/templates/user/user_profile_link.tpl
+++ b/web/WEB-INF/templates/user/user_profile_link.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty user}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>

diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
new file mode 100644 (file)
index 0000000..c4b41bc
--- /dev/null
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:form>
+               <h:panelGroup layout="block" styleClass="locale_selection_container">
+                       <h:panelGroup layout="block">
+                               <h:selectOneMenu styleClass="select" value="#{localizationController.localeCode}" onchange="submit()">
+                                       <f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
+                                       <f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
+                               </h:selectOneMenu>
+                       </h:panelGroup>
+
+                       <h:commandButton styleClass="submit" type="submit" action="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
+               </h:panelGroup>
+       </h:form>
+</ui:composition>

diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml
new file mode 100644 (file)
index 0000000..a2e1553
--- /dev/null
+++ b/web/admin/business_data/admin_business_data_list.xhtml
@@ -0,0 +1,93 @@
+<?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: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 name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
+       </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_CONTACT_BUSINESS_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <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_CONTACT_BUSINESS}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_business_data" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
+                                       <f:param name="businessDataId" value="#{businessContact.businessDataId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_OWNER_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
+
+                               <h:link outcome="admin_assign_business_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CONTACT_PERSON}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
+
+                               <h:link outcome="admin_assign_business_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CREATED}" />
+                               </f:facet>
+
+                               <h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
+                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
+
+               <h:form id="form_admin_add_business_data">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA}" />
+                               </div>
+
+                               <ui:include src="/WEB-INF/templates/admin/business_data/admin_form_business_data_data.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index d02fb758b205c50dc29eca4ee7117fdfb783f56e..e334721fbb5763f82263529e94e2c773c4c2180a 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index c6a1712245f96b26aebb647edff482c91c6109b7..ef24071403b205ed6e904adf450459f0c138c964 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 4bd0584e76419db25bb0ea61c450d5e2c1efaa02..942d44702f71858c9f251008117c112a3c4d5beb 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -16,7 +16,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 03d8c0e1fa6b9553cd4830418c89c64510ed8e69..a7a5019658954398447cf5e651c5f4ed645688f6 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -15,7 +15,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 72b85615b4887d9f357b967830a2cf8893e1743a..6456316475331b079d242dfcc029da03fccbf7c7 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index a196acfd95d92be24d3dde45df62aaf5b6d03c5a..7282f4faeaf045865711c1cb2bc943c4f73f027c 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -51,14 +51,14 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>
 
                <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 5c6788d50e8ceda676a70d138a212a33deab13e4..906f4b9b45a4f76165aae051e8c24b1257b10ba3 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -51,14 +51,14 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>
 
                <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 4735bdafc17eb2c42a03ad0ee0c78ceaccfeb17a..72ee0953e16184a9282c8b51b581ce72137fb89b 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -51,14 +51,14 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>
 
                <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/contact_business/admin_contact_business_list.xhtml b/web/admin/contact_business/admin_contact_business_list.xhtml
deleted file mode 100644 (file)
index bf0024b..0000000
--- a/web/admin/contact_business/admin_contact_business_list.xhtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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: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 name="admin_title">
-               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
-       </ui:define>
-
-       <ui:define name="content_header">
-               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
-       </ui:define>
-
-       <ui:define name="content">
-               <ui:fragment rendered="#{businessDataController.allBusinessContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_BUSINESS_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
-
-               <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_CONTACT_BUSINESS}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
-                       <h:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_ID}" />
-                               </f:facet>
-
-                               <h:link outcome="admin_show_contact_business" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
-                                       <f:param name="businessDataId" value="#{businessContact.businessDataId}" />
-                               </h:link>
-                       </h:column>
-
-                       <h:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_OWNER_ID}" />
-                               </f:facet>
-
-                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
-
-                               <h:link outcome="admin_assign_contact_business_owner" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
-                       </h:column>
-
-                       <h:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
-                               </f:facet>
-
-                               <h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
-                       </h:column>
-
-                       <h:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CONTACT_PERSON}" />
-                               </f:facet>
-
-                               <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
-
-                               <h:link outcome="admin_assign_contact_business_contact" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
-                       </h:column>
-
-                       <h:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CREATED}" />
-                               </f:facet>
-
-                               <h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
-                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-                               </h:outputText>
-                       </h:column>
-               </h:dataTable>
-
-               <h:form id="form_admin_add_contact_business">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_TITLE}" />
-                               </div>
-
-                               <div class="para">
-                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA}" />
-                               </div>
-
-                               <ui:include src="/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl" />
-
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
-                               </div>
-                       </h:panelGroup>
-               </h:form>
-       </ui:define>
-</ui:composition>

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index f34fbfafdda7f85be4cca114238165c0fbe858c6..94e83158e27875ff25d54033b4c5ee92a38967ff 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -45,7 +45,7 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index b6f722256c647f7a5a52264424489265ab584115..131da53e34729f5d6516c0234d05284cca79789b 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -39,7 +39,7 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index fb5776519279b8acba4d4baa9724291d6ef49238..1df83790245fbf55ac1f690f5a87c2d003e19b49 100644 (file)
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -55,7 +55,7 @@
                </h:dataTable>
 
                <ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 16cd072636adaf7cac57aab806cea9f7ac8c7327..b7675d947e32aae33360daf357bc8210278b6bb8 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -45,7 +45,7 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 17e9529dc3ca42332e4ec338bc5fbc0351826e26..ba38bb1a593f7767514331cc9e779250c5b75da3 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -39,7 +39,7 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 8767fe9312e8f3ca2c5b64e78e8449867dc48a95..426230c8209dd3bafcea2adcff085fd76997aa84 100644 (file)
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -55,7 +55,7 @@
                </h:dataTable>
 
                <ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 3c8b2d14f4ccbcc6fbfd15f2e418e158cd695d20..9a4536db984ec2c718eecf1d527134d8f41c018e 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -45,7 +45,7 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index fef08d8671fdcc487016da21e48897e3773cdd2f..1dc18b7103f342261014a9f5987c2fc021e8f97f 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -39,7 +39,7 @@
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 8f0ea33036ec976b289a4498c5b0fd15935b31c7..e6bedf9a60fe7a5efbe7c501759c34c884780372 100644 (file)
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -65,7 +65,7 @@
                </h:dataTable>
 
                <ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index d46cc09351cc21c65350452af1efc9aaaa3bf69d..b3ecdf9438e9e2bb3b53f14239b5d981133d14d2 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index e1aec671f0368b3306ac3950678fa92c20642531..cc6fbc27b3867ffee31f9ec9f2811145522ac7a5 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 0c4ca70120c262bbec7362ad9f681421381a9497..d498c7b48c2cc518e523a5910cf6909e90ea9dfe 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 79731fec36003225af4d6ac78a281e0c5b578e4f..db18fe83e65270145ced397cf74f01de326ecaee 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -16,7 +16,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 43f73d7637ef23551b43dbb894802ad2ee407dd2..25b960d53e223d6c9de053786a99bfa3f5a4870f 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -15,7 +15,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index c2b01b3eaac3e7f13246ecd2205e5c5ca1972538..4e4bddaaf0245865bfa32b8ffabb977ef81af7b9 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 3c79bdeb805c1866c061fe92b8ba0b8e9106527e..7637b2c7b69d958cd6095feda04c7c90c870e3cb 100644 (file)
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 03145215f6d12afdf10091609734b66b1444dce8..63eb5e22afc46e66d294b618b2112432bec5f619 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 288b64d82023ecb56f215119be2de942e550a4f7..29570f0c93363d1e75d70b65f9533f6ef1910877 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index c9c380d83ce77cae329729b94083a73154ff944c..da804aa4f528ea01abe4bdd1740b999fcf6cb0cd 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -37,7 +37,7 @@
                        </h:panelGroup>
 
                        <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <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>
@@ -45,7 +45,7 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 663d97a9d21a885f40e9222cbd7c9727d0e0f265..ba45e295d204b16476814772cdfe5663da64da48 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -41,7 +41,7 @@
                </h:panelGroup>>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index bf08a860246e188005454bb945f97a19ad5212de..55e02a4c3760b7dc9d18ae51a1b5730e223948fd 100644 (file)
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -33,7 +33,7 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index cab17c333c5c2b8f6031333d1d6c1ffac7c2fa7a..a68301a6cf92391687a030fe64666b60b93b9fba 100644 (file)
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -67,7 +67,7 @@
                </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/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 61032ce3dc55d84be3b0ed79d17642e9bc49e4d1..5da8d39c5bd4cea54d5bd9034168a1eaff4d49cd 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -31,7 +31,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <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>
@@ -49,7 +49,7 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 128e806c52c7cdff5c057fb633242fcadee55382..792cf67807b1fe4c32f259ebb4d45b89fd00abdf 100644 (file)
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -35,14 +35,14 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index d18f23ec6c41757ec762f042d8128f9652ce7eb1..2c98260810f4bbcad3e56182709943833c1c4be0 100644 (file)
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -29,7 +29,7 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml
index 8f6d50d7c1f6166bf9f3c26264f1a7075b49608a..f291735a2ed0c23eaf9ac7e5ef38213a83796605 100644 (file)
--- a/web/guest/user/user_resend_done.xhtml
+++ b/web/guest/user/user_resend_done.xhtml
@@ -14,7 +14,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                        <ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
                </ui:include>
        </ui:define>

diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index cb9aa3a21aecaa851aa5b4015f8092f4490a49da..92742a6953d4ad16da4f3561e873027b3374657c 100644 (file)
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -54,7 +54,7 @@
                </h:form>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index afd7381591dcf6aad772cab452e9c5a720cddc4e..170e5fcb20c09c6c9adc30df56a8818139c07dad 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -15,7 +15,7 @@
 
        <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/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                        </ui:include>
                </ui:fragment>

diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index c21ff285a228c3bc33142089090deff5b44469b7..6ddb2373e39985f1fb24a9b90d64c13676f2e8a0 100644 (file)
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -15,7 +15,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                        </ui:include>
                </ui:fragment>

diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index 2127d8a01b85160b698371044a414b9be590e97d..36821750860c3517da3aeb557c1f691c126c8b7d 100644 (file)
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -52,7 +52,7 @@
                </h:panelGroup>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 16e42405d81a620cde5f04e4bf0a00043f55e322..7eddb313727d689ba794486d917d845cc3756e0b 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -15,7 +15,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>
@@ -79,7 +79,7 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index 89e5b773ee1811c2b4ae003e0ddb3dcab7ece324..18b8be0d639899656650cae6d678100b9a8dc373 100644 (file)
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -34,7 +34,7 @@
                </h:panelGroup>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index 3fe4121f68f9ddcf944f57c534afc311a0567899..047c2649738f26cdd93dfc747c96d93989ae6e29 100644 (file)
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -15,7 +15,7 @@
 
        <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/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                        </ui:include>
                </ui:fragment>
@@ -25,7 +25,7 @@
                </ui:fragment>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <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>

diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 6f9eadccd4a57212efde6f3676dfb5748fd78466..aa7c60622411156572cd6e9dd62c2b24a5d8addc 100644 (file)
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -15,7 +15,7 @@
 
        <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/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                        </ui:include>
                </ui:fragment>