From 54ce6a6477aa8ad725bf2c84f7de13e1f14d8abc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 16 Jul 2018 22:36:22 +0200
Subject: [PATCH] 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)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/links.jsf.taglib.xml              | 52 +++++++++----------
 .../admin/panel_grids/fax/admin_fax_data.tpl  |  4 +-
 .../landline/admin_landline_data.tpl          |  4 +-
 .../panel_grids/mobile/admin_mobile_data.tpl  |  4 +-
 .../resources/tags/messages/message_box.tpl   |  2 +-
 .../tags/profile/user/user_profile_link.tpl   |  2 +-
 .../basic_data/admin_form_basic_data.tpl      |  2 +-
 .../admin/fax/admin_fax_add_show.tpl          |  2 +-
 .../admin/fax/admin_form_add_contact_fax.tpl  |  2 +-
 .../admin_form_add_contact_landline.tpl       |  2 +-
 .../landline/admin_landline_add_show.tpl      |  2 +-
 .../mobile/admin_form_add_contact_mobile.tpl  |  2 +-
 .../admin/mobile/admin_mobile_add_show.tpl    |  2 +-
 .../templates/login/user/user_base.tpl        |  2 +-
 web/WEB-INF/widgets.jsf.taglib.xml            | 10 ++--
 .../basic_data/admin_basic_data_list.xhtml    |  2 +-
 .../admin_branch_office_list.xhtml            |  2 +-
 web/admin/contact/admin_contact_delete.xhtml  |  2 +-
 web/admin/contact/admin_contact_edit.xhtml    |  2 +-
 web/admin/contact/admin_contact_list.xhtml    |  2 +-
 web/admin/contact/admin_contact_show.xhtml    |  4 +-
 .../unlink/admin_contact_fax_unlink.xhtml     |  6 +--
 .../admin_contact_landline_unlink.xhtml       |  6 +--
 .../unlink/admin_contact_mobile_unlink.xhtml  |  6 +--
 web/admin/country/admin_country_list.xhtml    |  2 +-
 .../department/admin_department_list.xhtml    |  2 +-
 web/admin/employee/admin_employee_list.xhtml  |  2 +-
 web/admin/fax/admin_fax_delete.xhtml          |  4 +-
 web/admin/fax/admin_fax_edit.xhtml            |  2 +-
 .../headquarter/admin_headquarter_list.xhtml  |  2 +-
 .../landline/admin_landline_delete.xhtml      |  4 +-
 web/admin/landline/admin_landline_edit.xhtml  |  2 +-
 web/admin/mobile/admin_mobile_delete.xhtml    |  4 +-
 web/admin/mobile/admin_mobile_edit.xhtml      |  2 +-
 .../admin_mobile_provider_list.xhtml          |  2 +-
 .../admin_opening_time_list.xhtml             |  2 +-
 web/admin/user/admin_user_activity_log.xhtml  |  2 +-
 web/admin/user/admin_user_delete.xhtml        |  2 +-
 web/admin/user/admin_user_edit.xhtml          |  2 +-
 web/admin/user/admin_user_list.xhtml          |  2 +-
 web/admin/user/admin_user_lock.xhtml          |  2 +-
 .../admin_user_resend_confirmation_link.xhtml |  2 +-
 web/admin/user/admin_user_show.xhtml          | 30 ++++++-----
 web/admin/user/admin_user_unlock.xhtml        |  2 +-
 web/guest/user/user_confirm_account.xhtml     |  4 +-
 web/guest/user/user_list.xhtml                |  2 +-
 web/guest/user/user_login.xhtml               |  2 +-
 web/guest/user/user_lost_password.xhtml       |  2 +-
 web/guest/user/user_profile.xhtml             |  6 +--
 web/guest/user/user_register.xhtml            |  4 +-
 web/guest/user/user_register_done.xhtml       |  2 +-
 web/guest/user/user_register_page2.xhtml      |  2 +-
 web/guest/user/user_resend_done.xhtml         |  2 +-
 web/guest/user/user_resend_link.xhtml         |  2 +-
 web/user/login_contact_data_saved.xhtml       |  4 +-
 web/user/login_data_saved.xhtml               |  2 +-
 .../login_user_change_email_address.xhtml     |  2 +-
 web/user/login_user_change_password.xhtml     |  4 +-
 .../login_user_change_personal_data.xhtml     |  2 +-
 web/user/login_user_contact_data_saved.xhtml  |  4 +-
 web/user/login_user_data_saved.xhtml          |  2 +-
 61 files changed, 125 insertions(+), 123 deletions(-)

diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml
index 3999a3fe..0d3a6097 100644
--- 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 292fbc86..9dba4534 100644
--- 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 0e8cc5e0..12ba2049 100644
--- 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 cebca29c..ba492542 100644
--- 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 0450cf5c..e70f82be 100644
--- 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 4e753cbe..adcd8f2c 100644
--- 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 aad4093e..889bd7fc 100644
--- 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
@@ -44,7 +44,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
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 2d5dc78e..2f24f3a6 100644
--- 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 f99fe227..4ae25536 100644
--- 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 6b50af25..41ee57a0 100644
--- 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 8a1dac4a..5f24e211 100644
--- 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 0b83dc6b..a473efa4 100644
--- 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 ea26308b..bf25e964 100644
--- 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 f82019a4..21719741 100644
--- 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 917ae0a3..594505c8 100644
--- 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 19e829e9..3908532f 100644
--- 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 320bec09..a6711824 100644
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -176,7 +176,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 90ea0adb..03745948 100644
--- 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 3eb39c69..3f7d14d0 100644
--- 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 d5061708..7a13e1c0 100644
--- 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 7eb7a6ff..e253a924 100644
--- 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 a8decc5d..aa2c4fdb 100644
--- 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 3fc338a4..8cbfdb51 100644
--- 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 3a3a9221..cb8ba297 100644
--- 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 c68126ce..83f1a97a 100644
--- 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 1ac1f068..03d8d46c 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -162,7 +162,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 4ff506b7..0f84b63c 100644
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -144,7 +144,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 c1dad067..770fcb1f 100644
--- 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 08902b86..ff4ffa60 100644
--- 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 a3baebe9..b728eb55 100644
--- 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 1533c029..2098e992 100644
--- 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 b744a62f..16649522 100644
--- 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 8a1b96ff..79d6a378 100644
--- 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 843c3e89..f551e279 100644
--- 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 812b1750..baf809ba 100644
--- 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 124dc995..a7128e1d 100644
--- 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 6f0b9b24..38819335 100644
--- 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 9cee8cba..bb01a76d 100644
--- 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 1eb1e939..add12b6c 100644
--- 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 85ca02fa..d4652d6d 100644
--- 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 461d8a69..325142cb 100644
--- 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 2dee8442..89c54996 100644
--- 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 01d63232..a15156b3 100644
--- 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 662e9fa7..cfe6cc37 100644
--- 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 66492692..8d610288 100644
--- 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 54951ad2..5222b035 100644
--- 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 e3740a26..e8a391fa 100644
--- 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 4d8ab913..bd8e76cf 100644
--- 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 8fa534a6..5c12d183 100644
--- 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 fe329d41..c3b1dc15 100644
--- 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 44768797..8e764edc 100644
--- 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 ae96121f..73b3abe9 100644
--- 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 f0502303..5b13af3c 100644
--- 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 0b7c8c66..4b0b32c4 100644
--- 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 c1b1bed2..cdfdb608 100644
--- 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 03a37e24..6c6972e3 100644
--- 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 e0d6492d..36796c60 100644
--- 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 0634a43a..2e859d86 100644
--- 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 ed17cba9..2ba734ff 100644
--- 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 312607c7..0e5da1fd 100644
--- 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 44c0d7ac..36537211 100644
--- 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}" />
-- 
2.39.5