Please cherry-pick:

- renamed *MiniLinks to *DropdownMenu to reflect actual purpose of these custom
  tags
- renamed to generic "id" EL variable to "panelGroupId", was causing trouble
- ids should not have dashes in them (caused some exceptions)

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

diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml
index 3999a3feffe7075b23d0d0095ca04b0b35051b62..0d3a6097c6a46701f721fedb481e668d642ad05b 100644 (file)
--- a/web/WEB-INF/links.jsf.taglib.xml
+++ b/web/WEB-INF/links.jsf.taglib.xml
@@ -40,8 +40,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputFaxNumberAdminMiniLinks</tag-name>
-               <description>This tag renders a full h:panelGroup for administrative "mini-links" for fax data.</description>
+               <tag-name>outputFaxNumberAdminDropdownMenu</tag-name>
+               <description>This tag renders a full h:panelGroup for an administrative drop-down menu for fax data.</description>
                <source>resources/tags/admin/dropdown/fax/admin_fax_links.tpl</source>
                <attribute>
                        <name>faxNumber</name>
@@ -69,8 +69,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputLandLineNumberAdminMiniLinks</tag-name>
-               <description>This tag renders a full h:panelGroup for administrative "mini-links" for land-line data.</description>
+               <tag-name>outputLandLineNumberAdminDropdownMenu</tag-name>
+               <description>This tag renders a full h:panelGroup for an administrative drop-down menu for land-line data.</description>
                <source>resources/tags/admin/dropdown/landline/admin_landline_links.tpl</source>
                <attribute>
                        <name>landLineNumber</name>
@@ -98,8 +98,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputMobileNumberAdminMiniLinks</tag-name>
-               <description>This tag renders a full h:panelGroup for administrative "mini-links" for mobile data.</description>
+               <tag-name>outputMobileNumberAdminDropdownMenu</tag-name>
+               <description>This tag renders a full h:panelGroup for an administrative drop-down menu for mobile data.</description>
                <source>resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl</source>
                <attribute>
                        <name>mobileNumber</name>
@@ -127,8 +127,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputMobileProviderAdminMiniLinks</tag-name>
-               <description>This tag renders a full h:panelGroup for administrative "mini-links" for mobile provider data.</description>
+               <tag-name>outputMobileProviderAdminDropdownMenu</tag-name>
+               <description>This tag renders a full h:panelGroup for an administrative drop-down menu for mobile provider data.</description>
                <source>resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl</source>
                <attribute>
                        <name>mobileProvider</name>
@@ -150,8 +150,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputBasicDataAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given basic data instance.</description>
+               <tag-name>outputBasicDataAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given basic data instance.</description>
                <source>resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl</source>
                <attribute>
                        <name>basicData</name>
@@ -173,8 +173,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputHeadquarterAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given headquarter instance.</description>
+               <tag-name>outputHeadquarterAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given headquarter instance.</description>
                <source>resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl</source>
                <attribute>
                        <name>headquarter</name>
@@ -196,8 +196,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputBranchOfficeAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given branchOffice instance.</description>
+               <tag-name>outputBranchOfficeAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given branchOffice instance.</description>
                <source>resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl</source>
                <attribute>
                        <name>branchOffice</name>
@@ -219,8 +219,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputDepartmentAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given department instance.</description>
+               <tag-name>outputDepartmentAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given department instance.</description>
                <source>resources/tags/admin/dropdown/department/admin_department_links.tpl</source>
                <attribute>
                        <name>department</name>
@@ -242,8 +242,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputEmployeeAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given employee instance.</description>
+               <tag-name>outputEmployeeAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given employee instance.</description>
                <source>resources/tags/admin/dropdown/employee/admin_employee_links.tpl</source>
                <attribute>
                        <name>employee</name>
@@ -265,8 +265,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputOpeningTimeAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given opening time instance.</description>
+               <tag-name>outputOpeningTimeAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given opening time instance.</description>
                <source>resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl</source>
                <attribute>
                        <name>openingTime</name>
@@ -288,8 +288,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputContactAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given contact instance.</description>
+               <tag-name>outputContactAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given contact instance.</description>
                <source>resources/tags/admin/dropdown/contact/admin_contact_links.tpl</source>
                <attribute>
                        <name>contact</name>
@@ -311,8 +311,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputCountryAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given country instance.</description>
+               <tag-name>outputCountryAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given country instance.</description>
                <source>resources/tags/admin/dropdown/country/admin_country_links.tpl</source>
                <attribute>
                        <name>country</name>
@@ -334,8 +334,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                </attribute>
        </tag>
        <tag>
-               <tag-name>outputUserAdminMiniLinks</tag-name>
-               <description>This tag renders administrative "mini-links" for given user instance.</description>
+               <tag-name>outputUserAdminDropdownMenu</tag-name>
+               <description>This tag renders an administrative drop-down menu for given user instance.</description>
                <source>resources/tags/admin/dropdown/user/admin_user_links.tpl</source>
                <attribute>
                        <name>user</name>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
index 292fbc867470f2e8da1628fbc2d0ca3a75942245..9dba453440099ccb5ac6f2115aa7cc4acc25595d 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -51,11 +51,11 @@
                        </h:outputText>
                </p:column>
 
-               <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+               <p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
+                               <links:outputFaxNumberAdminDropdownMenu faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
                        </h:panelGroup>
                </p:column>
        </p:panelGrid>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index 0e8cc5e05bb3c5fea25b8316bfe637db6faad3d7..12ba2049104eddcb83dfac6bd8aba07e3e55c612 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -51,11 +51,11 @@
                        </h:outputText>
                </p:column>
 
-               <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+               <p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
+                               <links:outputLandLineNumberAdminDropdownMenu landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
                        </h:panelGroup>
                </p:column>
        </p:panelGrid>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
index cebca29ce1a23f3e21763d6a4f03c52e85763624..ba492542da8c2ea4700aaffca7cde656bb7a4c12 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -56,11 +56,11 @@
                        </h:outputText>
                </p:column>
 
-               <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+               <p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
+                               <links:outputMobileNumberAdminDropdownMenu mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
                        </h:panelGroup>
                </p:column>
        </p:panelGrid>

diff --git a/web/WEB-INF/resources/tags/messages/message_box.tpl b/web/WEB-INF/resources/tags/messages/message_box.tpl
index 0450cf5ca1f0e8c2b07d8c6f57448e4dae52d7c0..e70f82be05dae73cffc7e646e000f2096a51049f 100644 (file)
--- a/web/WEB-INF/resources/tags/messages/message_box.tpl
+++ b/web/WEB-INF/resources/tags/messages/message_box.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <h:panelGroup id="#{id}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
+       <h:panelGroup id="#{panelGroupId}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
                <div class="message-header">
                        <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
                </div>

diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
index 4e753cbe7b1c7fac376b91e1fce3c98f8de1a9aa..adcd8f2c0626b68345336877d1c54269ef115ced 100644 (file)
--- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
+++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
@@ -8,7 +8,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <core:outputMessageBox id="nonpublic-user-profile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+       <core:outputMessageBox panelGroupId="nonPublicUserProfile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
        <p:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
                <h:outputText value="#{user.userName}" />

diff --git a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
index c2e2bdb2ad75ea08d785abc2777665db25cd49e7..3f676b71be51638f14300bf58d317d20568b524e 100644 (file)
--- a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
+++ b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
@@ -38,7 +38,7 @@
                                </p:inputText>
 
                                <p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_LOGO}" />
-                               <core:outputMessageBox id="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
+                               <core:outputMessageBox panelGroupId="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
 
                                <p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER}" />
                                <p:inputText id="companyTaxNumber" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyTaxNumber}" />

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 2d5dc78e32af26453ee4f024435af05d91880c2a..2f24f3a62acfdddbba0486bdbdd60f322f4d91c8 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:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <core:outputMessageBox id="error-helper-contact-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox panelGroupId="errorHelperAddFax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />

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 f99fe2273a610d7ea5bba2467a3de202e07f74f0..4ae25536a91d76d4a739d4e713dc9b59ce2afff1 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
@@ -8,7 +8,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <core:outputMessageBox id="error-helper-contact-add-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox panelGroupId="errorHelperContactAddFax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup layout="block">

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 6b50af2594648fddaa75b8e4c7b3ee5b129090a4..41ee57a033e5cd839c113e7259f1a620aa4201c5 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
@@ -8,7 +8,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <core:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox panelGroupId="errorHelperContactAddLandline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup layout="block">

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 8a1dac4a3fb3a91d2b38b46e2f6cd81de877365e..5f24e211cb715b34e964c7ed1921df90c18b4f5b 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:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox panelGroupId="errorHandlerAddLandLine" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />

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 0b83dc6b2e5654a8a08aecf993b2ba8b6adaa698..a473efa4ce7781eb09bd575218ed31f1bce8cb27 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
@@ -8,7 +8,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox panelGroupId="errorHandlerAddMobileContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup layout="block">

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
index ea26308b45cfbf399ad6c1969215ddeb095ca9d7..bf25e964ca8d7e767af02837ed85eab75dfc1658 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox panelGroupId="errorHandlerAddMobile" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index f82019a44ecb05a06a612eb15dbe34ac7abfce28..2171974196f21e5d4d6f2f9e50755254a4d12101 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>
 
        <ui:define name="menu">
-               <core:outputMessageBox id="error-guest-forbidden" message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
+               <core:outputMessageBox panelGroupId="errorGuestForbidden" message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />

diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index 780a8ae329d260d3e89d5839cac6972884dd5c3c..7b6b5ec88263367f6d7fae552b5cdf465f3c9adb 100644 (file)
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -33,8 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.String</type>
                </attribute>
                <attribute>
-                       <name>id</name>
-                       <description>Id of the JSF component.</description>
+                       <name>panelGroupId</name>
+                       <description>Id of the panel group component.</description>
                        <required>true</required>
                        <type>java.lang.String</type>
                </attribute>
@@ -218,7 +218,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.Boolean</type>
                </attribute>
                <attribute>
-                       <name>showAdminMiniLinks</name>
+                       <name>showAdminDropdownMenu</name>
                        <description>Whether to show administrative links to other pages (default: true).</description>
                        <required>false</required>
                        <type>java.lang.Boolean</type>
@@ -253,7 +253,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.Boolean</type>
                </attribute>
                <attribute>
-                       <name>showAdminMiniLinks</name>
+                       <name>showAdminDropdownMenu</name>
                        <description>Whether to show administrative links to other pages (default: true).</description>
                        <required>false</required>
                        <type>java.lang.Boolean</type>
@@ -288,7 +288,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.Boolean</type>
                </attribute>
                <attribute>
-                       <name>showAdminMiniLinks</name>
+                       <name>showAdminDropdownMenu</name>
                        <description>Whether to show administrative links to other pages (default: true).</description>
                        <required>false</required>
                        <type>java.lang.Boolean</type>

diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index 19e829e902c12ecb48e360656defa99720b18c32..3908532f5e5e35a2a2d7cac8a45ba58462ac020b 100644 (file)
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -176,7 +176,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
+                                       <links:outputBasicDataAdminDropdownMenu basicData="#{basicData}" />
                                </p:column>
                        </p:dataTable>
 

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 013961e8cf4b97538b7384f0b3d5549be4bb9b9c..3a9cdff5163880fb4cf8179594730ea779739b1d 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -171,7 +171,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
+                                       <links:outputBranchOfficeAdminDropdownMenu branchOffice="#{branchOffice}" />
                                </p:column>
                        </p:dataTable>
 

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 90ea0adb0d36c5167d78c8b62ec33ad0c5e0e739..037459485470d235d6b2bb18a430cfabb53c6830 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox panelGroupId="errorHandlerDeleteContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.contact}">
                        <h:inputHidden value="#{adminContactController.contactId}" />

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 3eb39c69675a2143f2924d6fca8d7c7597b53090..3f7d14d0a9a3a12db5e00d1e3e9afa4cdeb37080 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox panelGroupId="errorHandlerEditContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form-admin-edit-contact" rendered="#{not empty beanHelper.contact}">
                        <h:inputHidden value="#{adminContactController.contactId}" />

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index d50617083314a30c9638f9c336facaebb72b58ac..7a13e1c0d8ab41549fdf029d479656a82914c659 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -87,7 +87,7 @@
                                                <h:outputText value="#{msg.ADMIN_ACTION_LINKS_HEADER}" />
                                        </f:facet>
 
-                                       <links:outputContactAdminMiniLinks contact="#{contact}" />
+                                       <links:outputContactAdminDropdownMenu contact="#{contact}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 7eb7a6ff6bdb249d4647a25ba4e91d7fd564eda7..e253a92443581f95d2807ab50496af113a5f9c59 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox panelGroupId="errorHandlerShowContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="para" layout="block">
@@ -33,7 +33,7 @@
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
-                               <links:outputContactAdminMiniLinks contact="#{beanHelper.contact}" renderShowLink="false" />
+                               <links:outputContactAdminDropdownMenu contact="#{beanHelper.contact}" renderShowLink="false" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index a8decc5d80b59f3c55ddd943bdfe41f289b32d9e..aa2c4fdb54f0578f72ad7e226b38ec6611654f62 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -27,9 +27,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlinkFaxNumber" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
-               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminContactPhoneController.contact}" />
@@ -51,7 +51,7 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
                                </div>
 
                                <p:panelGrid columns="2" layout="grid">

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 3fc338a464269c1574e8e16b82ad02bd0717ecc1..8cbfdb51554b7eefd45795fd698acca3e2ab1a76 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -25,9 +25,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlinkLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
@@ -46,7 +46,7 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
                                </div>
 
                                <p:panelGrid columns="2" layout="grid">

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 3a3a92218b811085a5e0a4c3a00940e9eed4f351..cb8ba29770eeb4d7ba61f25017bd3650b535aec5 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -25,9 +25,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlinkMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
-               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
@@ -46,7 +46,7 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
                                </div>
 
                                <p:commandButton

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index c68126ce100ffefa35b2ceb1ccb433ec5c155c4f..83f1a97aa02d8a03d43440418da30e1ba5afc683 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -68,7 +68,7 @@
                                                <h:outputText value="#{msg.ADMIN_ACTION_LINKS_HEADER}" />
                                        </f:facet>
 
-                                       <links:outputCountryAdminMiniLinks country="#{country}" />
+                                       <links:outputCountryAdminDropdownMenu country="#{country}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 0531ecd374286b8018a421f917e5c847fe0eda2b..06c608831402c8ef04a173f4fa618d6b0212f36e 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -164,7 +164,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputDepartmentAdminMiniLinks department="#{department}" />
+                                       <links:outputDepartmentAdminDropdownMenu department="#{department}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 657c29897a248b3b670601dca7f7a5f4d8079127..8dac5c9715acecc67ea43da1780d149dfdaca1e4 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -141,7 +141,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputEmployeeAdminMiniLinks employee="#{employee}" />
+                                       <links:outputEmployeeAdminDropdownMenu employee="#{employee}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index c1dad067f2a69b087538b550a37d015605c1bd53..770fcb1fd3b8c349bc72ae1f65e7a65ff99ac4a8 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerDeleteFax" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
                <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminPhoneController.phoneId}" />
@@ -36,7 +36,7 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminDropdownMenu="false" />
                                </div>
 
                                <div class="para">

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 08902b866859308fae260368596badfdf2411e48..ff4ffa606ef81028937c08e8ef9433f1783bb1b1 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerEditFax" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
                <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminPhoneController.phoneId}" />

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index a3baebe97f35ef16861eafeb525909e563529713..b728eb5538a3587e00b0cc9513cff665b059d5fb 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -124,7 +124,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputHeadquarterAdminMiniLinks headquarter="#{headquarter}" />
+                                       <links:outputHeadquarterAdminDropdownMenu headquarter="#{headquarter}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 1533c029e0dadd4a97c87e949b76dd08f0feec8a..2098e992672be6cb389f482d35d90b38f89f4334 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerDeleteLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
                <h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
@@ -34,7 +34,7 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" renderShowLink="false" showAdminDropdownMenu="false" />
                                </div>
 
                                <div class="para">

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index b744a62fd0608b98f14eede5796efb3a091c2bea..166495221c52129593ee1eb018bfcbcca31188fc 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerEditLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
                <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup layout="block">

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 8a1b96ffd54e01655aacee000af5a55df1310469..79d6a3781a17b4a174645aa3e788b11845091e8b 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerDeleteMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
                <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
@@ -34,7 +34,7 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" renderShowLink="false" showAdminDropdownMenu="false" />
                                </div>
 
                                <div class="para">

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 843c3e890f476999c48ad1a88c9322f9aa657803..f551e27910b2a11e1de868b992d16a60fbfcc9d4 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+               <core:outputMessageBox panelGroupId="errorHandlerEditMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
                <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                        <h:panelGroup layout="block">

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 812b17507f3f2ee8034cb0737793b5509a76619c..baf809ba2278020b1e8b58e45d81b66b890fe82c 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -95,7 +95,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
-                                       <links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
+                                       <links:outputMobileProviderAdminDropdownMenu mobileProvider="#{mobileProvider}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml
index 124dc995158bcf66662f73e873ab5c808cc0804a..a7128e1daaf53d7d3ea623f7b251b01517a0eaf1 100644 (file)
--- a/web/admin/opening_time/admin_opening_time_list.xhtml
+++ b/web/admin/opening_time/admin_opening_time_list.xhtml
@@ -104,7 +104,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputOpeningTimeAdminMiniLinks openingTime="#{openingTime}" />
+                                       <links:outputOpeningTimeAdminDropdownMenu openingTime="#{openingTime}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 416b60e0277e684da69a0869ae779a7e71ce34fd..6291832ec8370e83e34bfd9b0f592116c84225fd 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUserActivityLog" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <p:dataTable
                        id="table_user_activity_log"

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 9cee8cba5df827c5b8ac72946653e0992f44ed0c..bb01a76dc94659ac0f6a45a131b8d8ed23192f8d 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerDeleteUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.user}">
                        <h:panelGroup layout="block">

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 1eb1e9395d154876672f06da435237cf8f3db83f..add12b6cce1b73444597404b2fad7cff983622da 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerEditUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
                        <h:panelGroup layout="block">

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 85ca02fac1f2c043cb21e36ba1ad081ad6b6fe87..d4652d6d40985b031e1034cfdaea064ab6201e7d 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -143,7 +143,7 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-                                       <links:outputUserAdminMiniLinks user="#{user}" />
+                                       <links:outputUserAdminDropdownMenu user="#{user}" />
                                </p:column>
                        </p:dataTable>
                </h:form>

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 461d8a69d95619c4363cb29fd33b636d83513c6c..325142cbe4afb09ccfa31d8fc278e518269e2cb4 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerLockUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-user-lock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                        <h:panelGroup layout="block">

diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 2dee8442114f6f542696f63a86c9b0a9a10f9730..89c54996ebbd9049e75580eb9562fabb46dd8c07 100644 (file)
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerResendLinkUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-user-resend" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
                        <h:panelGroup layout="block">

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 01d63232a42bb55fcb7573507c702c18ce8d24e4..a15156b379c289e6b67d3edae90d6760a2948098 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -25,24 +25,26 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerShowUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
+               <ui:fragment rendered="#{not empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
-               <h:panelGroup styleClass="para" layout="block">
-                       <links:outputUserAdminLinks user="#{beanHelper.user}" renderShowLink="false" renderContactLinks="true" renderHeader="true" />
-               </h:panelGroup>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <links:outputUserAdminLinks user="#{beanHelper.user}" renderShowLink="false" renderContactLinks="true" renderHeader="true" />
+                       </h:panelGroup>
 
-               <h:panelGroup styleClass="para" layout="block">
-                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-               </h:panelGroup>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </h:panelGroup>
 
-               <h:panelGroup styleClass="para" layout="block">
-                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-               </h:panelGroup>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+                       </h:panelGroup>
 
-               <h:panelGroup styleClass="para" layout="block">
-                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-               </h:panelGroup>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+                       </h:panelGroup>
+               </ui:fragment>
        </ui:define>
 </ui:composition>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 662e9fa797cb9733cfc7aac8cb8950ca0cb2aa10..cfe6cc37c19f9aefd92020b9cf8ada547ed8cb03 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -25,7 +25,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerUnlockUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-user-unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <h:panelGroup layout="block">

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 6649269257ecc50906021184ad70f3b9281e9622..8d610288dde38f98f181d725fc2e57544e1688b8 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -39,9 +39,9 @@
                                </h:panelGroup>
                        </h:panelGroup>
 
-                       <core:outputMessageBox id="error-helper-user" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+                       <core:outputMessageBox panelGroupId="errorHandlerConfirmUser" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
                </ui:fragment>
 
-               <core:outputMessageBox id="error-confirmation-key" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
+               <core:outputMessageBox panelGroupId="errorConfirmationKey" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>

diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 54951ad2a6818953a2ad94462c0bc6b080a96108..5222b035b087045fc6b7f9dc94ad30c3e04ff6c9 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -19,7 +19,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+               <core:outputMessageBox panelGroupId="errorUserListDisabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
 
                <h:panelGroup
                        layout="block"

diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index e3740a26cd56e95fec26b4b098715af151a6a2ef..e8a391fa51c74b6db4e8da74a2eeeb593888fad0 100644 (file)
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -17,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-login-disabled" message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+               <core:outputMessageBox panelGroupId="errorUserLoginDisabled" message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">

diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index 4d8ab913a36bcd30a53e8e1ba527f77cd2c1551c..bd8e76cf2dd0a747d0736bc5faaedab89fdd8cdb 100644 (file)
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -18,7 +18,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-recovery-disabled" message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+               <core:outputMessageBox panelGroupId="errorUserRecoveryDisabled" message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                        <div id="user_lost_password_content">

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 8fa534a6ff0b00a7d25740ecca0ef12b7cf5f14a..5c12d183329cfe432a381d41a79a417e33722f80 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -29,12 +29,12 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-profile-disabled" message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
+               <core:outputMessageBox panelGroupId="errorUserProfileDisabled" message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
 
-               <core:outputMessageBox id="error-user-id-empty" message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" rendered="#{userController.isUserIdEmpty()}" />
+               <core:outputMessageBox panelGroupId="errorUserIdEmpty" message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" rendered="#{userController.isUserIdEmpty()}" />
 
                <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-                       <core:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+                       <core:outputMessageBox panelGroupId="errorUserProfileHidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                <p:panelGrid>

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index fe329d411d336f6b855f4b094ad06f3df82a5442..c3b1dc1521a15f0c28bf5eaaa6fbec425984232f 100644 (file)
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -17,9 +17,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-registration-disabled" message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
+               <core:outputMessageBox panelGroupId="errorUserRegistrationDisabled" message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
 
-               <core:outputMessageBox id="error-user-registration-index" message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
+               <core:outputMessageBox panelGroupId="errorUserRegistrationIndex" message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">

diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index 44768797d6adbff75791ec63bd058b2ef40aaa7a..8e764edc3a0ec0100003a2d6d3df05b8124bf7ce 100644 (file)
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -13,7 +13,7 @@
        </ui:define>
 
        <ui:define name="content_header">
-               <core:outputMessageBox id="user-registration-completed" message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
+               <core:outputMessageBox panelGroupId="user-registration-completed" message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
        </ui:define>
 
        <ui:define name="content">

diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index ae96121fa1ed5987bd5c5e44b1bed32a5082baf6..73b3abe96247cbf2bb925c149d6acadde34cfa0d 100644 (file)
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -17,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-registration-multi-disabled" message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+               <core:outputMessageBox panelGroupId="errorUserRegistrationMultiDisabled" message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">

diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml
index f0502303167846447840605779f0721e3d08587d..5b13af3c900d9c59ef4d4c506f9ad39ad91fc61a 100644 (file)
--- a/web/guest/user/user_resend_done.xhtml
+++ b/web/guest/user/user_resend_done.xhtml
@@ -16,6 +16,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="guest-user-resend-link-completed" message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+               <core:outputMessageBox panelGroupId="guest-user-resend-link-completed" message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
        </ui:define>
 </ui:composition>

diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index 0b7c8c66bef466440835a8433961682ce2427d6b..4b0b32c4dc46a029cff43981e64fcc64fcea63ff 100644 (file)
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -19,7 +19,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-resend-link-disabled" message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+               <core:outputMessageBox panelGroupId="errorUserResendLinkDisabled" message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
 
                <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                        <h:panelGroup styleClass="table" layout="block">

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index c1b1bed2ee4f64b80f2df833ef90a3ee6fa18da5..cdfdb6085d6c54092ee2d77edb7d906a5b8e65db 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -17,9 +17,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <core:outputMessageBox panelGroupId="loginUserDataSaved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <core:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+               <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />

diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 03a37e2412a5749cab61a86a97c4a57fcbe7d4ea..6c6972e397d680bf6d6f53448365606b46caaf24 100644 (file)
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -16,7 +16,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
+               <core:outputMessageBox panelGroupId="loginUserDataSaved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />

diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index e0d6492d3c205b877800ed6b7e7a23e1f4bfa8af..36796c609b1613190a3e67807c93d7f1beae0209 100644 (file)
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -17,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-change-email-disabled" message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+               <core:outputMessageBox panelGroupId="errorUserChangeEmailDisabled" message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
 
                <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
                        <div class="table-header">

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 0634a43a0eb7ccb586175e32a5550f651a528b57..2e859d8603e702a396e457307d0092e32afa9baa 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -17,9 +17,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="login-user-must-change-password" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
+               <core:outputMessageBox panelGroupId="loginUserMustChangePassword" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
-               <core:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+               <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />

diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index ed17cba99caafbf9ab6091af8d2a79ef2b42044c..2ba734ff29fb9a254c6e5e63c432f1b2f71f6504 100644 (file)
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -17,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />

diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index 312607c7b5ccc9aad5931f7af4998b376010ac04..0e5da1fd1d6b74069e76b45d0e06fff090d03302 100644 (file)
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -17,9 +17,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <core:outputMessageBox panelGroupId="loginUserDataSaved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <core:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" rendered="#{userLoginController.ifUserMustChangePassword()}" />
 

diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 44c0d7aca68822348a9480e24ac3e9dafb69e958..365372114811e6e549d5f6c891024586c8beb4cf 100644 (file)
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -17,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <core:outputMessageBox panelGroupId="loginUserDataSaved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />