From f508c7d270861b64c71b8d37887d9c24dde6634d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 19 Apr 2020 18:58:49 +0200
Subject: [PATCH] Please cherry-pick: - rewrote to not use
 fax_input_table_row.tpl - realigned JSF tags to have attributes in a separate
 line - got rid of some old tags from pre-PrimeFaces times
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../form_data/fax/admin_form_fax_data.tpl     | 43 ++++++++++------
 .../landline/admin_form_landline_data.tpl     | 43 ++++++++++------
 .../tags/profile/user/user_profile_link.tpl   |  8 ++-
 .../tags/table_rows/fax_input_table_row.tpl   | 28 -----------
 .../basic_data/admin_form_basic_data.tpl      |  7 ++-
 .../admin/fax/admin_fax_add_show.tpl          | 12 ++++-
 .../admin/fax/admin_form_add_contact_fax.tpl  |  9 +++-
 .../admin_form_add_contact_landline.tpl       | 45 ++++++++++-------
 .../landline/admin_landline_add_show.tpl      | 12 ++++-
 .../mobile/admin_form_add_contact_mobile.tpl  | 50 +++++++++++--------
 .../admin/mobile/admin_mobile_add_show.tpl    | 12 ++++-
 .../templates/login/user/user_base.tpl        |  8 ++-
 .../basic_data/admin_basic_data_list.xhtml    | 23 ++++++++-
 .../unlink/admin_contact_fax_unlink.xhtml     | 17 +++++--
 .../admin_contact_landline_unlink.xhtml       | 13 ++++-
 .../unlink/admin_contact_mobile_unlink.xhtml  | 15 ++++--
 web/admin/fax/admin_fax_delete.xhtml          |  6 ++-
 .../admin_generic_product_list.xhtml          | 21 ++++++--
 web/admin/mobile/admin_mobile_delete.xhtml    | 13 ++++-
 web/admin/user/admin_user_lock.xhtml          | 12 ++++-
 .../admin_user_resend_confirmation_link.xhtml | 12 ++++-
 web/admin/user/admin_user_unlock.xhtml        | 12 ++++-
 web/guest/user/user_confirm_account.xhtml     |  7 ++-
 web/guest/user/user_list.xhtml                |  7 ++-
 web/guest/user/user_login.xhtml               |  7 ++-
 web/guest/user/user_lost_password.xhtml       |  7 ++-
 web/guest/user/user_register.xhtml            | 14 +++++-
 web/guest/user/user_register_done.xhtml       |  5 +-
 web/guest/user/user_register_page2.xhtml      |  7 ++-
 web/guest/user/user_resend_done.xhtml         |  5 +-
 web/guest/user/user_resend_link.xhtml         | 16 +++++-
 web/user/login_contact_data_saved.xhtml       | 13 ++++-
 web/user/login_data_saved.xhtml               |  6 ++-
 .../login_user_change_email_address.xhtml     | 13 ++++-
 web/user/login_user_change_password.xhtml     | 15 ++++--
 .../login_user_change_personal_data.xhtml     |  9 +++-
 web/user/login_user_contact_data_saved.xhtml  | 13 ++++-
 web/user/login_user_data_saved.xhtml          |  6 ++-
 38 files changed, 413 insertions(+), 158 deletions(-)
 delete mode 100644 web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl

diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
index 08167961..c091322d 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
@@ -5,25 +5,36 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
-			</legend>
+	<p:fieldset
+		legend="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}"
+		title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			>
+			<p:outputLabel value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
+			<h:outputText value="#{adminPhoneController.phoneId}" />
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
-				</div>
+			<p:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
+			<p:panelGrid
+				layout="grid"
+				columns="3"
+				>
+				<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{adminPhoneController.phoneCountry}" />
 
-				<div class="table-right-medium">
-					<h:outputText id="faxNumberId" value="#{faxNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
+				<p:inputText size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
 
-			<core:outputFaxInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-		</fieldset>
-	</h:panelGroup>
+				<p:inputText size="10" maxlength="20" value="#{adminPhoneController.landLineNumber}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
+			</p:panelGrid>
+		</p:panelGrid>
+	</p:fieldset>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
index afd2b538..7c46612a 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
@@ -5,25 +5,36 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
-			</legend>
+	<p:fieldset
+		legend="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}"
+		title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			>
+			<p:outputLabel value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
+			<h:outputText value="#{adminPhoneController.phoneId}" />
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
-				</div>
+			<p:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
+			<p:panelGrid
+				layout="grid"
+				columns="3"
+				>
+				<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{adminPhoneController.phoneCountry}" />
 
-				<div class="table-right-medium">
-					<h:outputText id="landLineNumberId" value="#{landLineNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
+				<p:inputText size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
 
-			<core:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-		</fieldset>
-	</h:panelGroup>
+				<p:inputText size="10" maxlength="20" value="#{adminPhoneController.landLineNumber}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
+			</p:panelGrid>
+		</p:panelGrid>
+	</p:fieldset>
 </ui:composition>
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 f691140a..1e2e62d4 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,13 @@
 	xmlns:p="http://primefaces.org/ui"
 	>
 
-	<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)}" />
+	<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"
diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
deleted file mode 100644
index d06b4836..00000000
--- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:core="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:row rendered="#{empty rendered or rendered == true}">
-		<p:outputLabel for="faxNumber" value="#{labelMessage}" />
-
-		<p:column>
-			<core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
-			<p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
-				<f:validator validatorId="PhoneNumberValidator" />
-			</p:inputText>
-			<p:inputText id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
-				<f:validator validatorId="PhoneNumberValidator" />
-			</p:inputText>
-		</p:column>
-
-		<p:column>
-			<p:message for="faxAreaCode" />
-			<p:message for="faxNumber" />
-		</p:column>
-	</p:row>
-</ui:composition>
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 22367462..3d91a340 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
@@ -55,7 +55,12 @@
 				</p:inputText>
 
 				<p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_LOGO}" />
-				<core:outputMessageBox panelGroupId="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 2f24f3a6..0ac5df69 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,11 +6,19 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<core:outputMessageBox panelGroupId="errorHelperAddFax" 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" />
 	</ui:fragment>
 
-	<core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.contact.contactFaxNumber}" rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}" />
+	<core:outputAdminFaxPanelGrid
+		faxNumber="#{beanHelper.contact.contactFaxNumber}"
+		rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}"
+		/>
 </ui:composition>
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 65dab7cf..2b55ab49 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,12 @@
 	xmlns:p="http://primefaces.org/ui"
 	>
 
-	<core:outputMessageBox panelGroupId="errorHelperContactAddFax" 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 rendered="#{not empty beanHelper.contact}">
 		<h:panelGroup layout="block">
@@ -32,7 +37,7 @@
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 
 						<f:selectItems
-							value="#{adminPhoneListController.allNonLinkedFaxNumbers}"
+							value="#{adminPhoneController.allNonLinkedFaxNumbers}"
 							var="faxNumber"
 							itemValue="#{faxNumber}"
 							itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}"
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 4d9d9740..722fe3ba 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,12 @@
 	xmlns:p="http://primefaces.org/ui"
 	>
 
-	<core:outputMessageBox panelGroupId="errorHelperContactAddLandline" 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 rendered="#{not empty beanHelper.contact}">
 		<h:panelGroup layout="block">
@@ -20,26 +25,28 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
 			</div>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu styleClass="select" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
-						<f:converter converterId="LandLineNumberConverter" />
+			<p:panelGrid
+				layout="grid"
+				columns="2"
+				>
+				<p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
+				<p:selectOneMenu
+					id="landLineNumber"
+					styleClass="select"
+					value="#{adminPhoneController.landLineNumber}"
+					>
+					<f:converter converterId="LandLineNumberConverter" />
 
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 
-						<f:selectItems
-							value="#{adminPhoneListController.allNonLinkedLandLineNumbers}"
-							var="landlineNumber"
-							itemValue="#{landlineNumber}"
-							itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}"
-							/>
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
+					<f:selectItems
+						value="#{adminPhoneController.allNonLinkedLandLineNumbers}"
+						var="landlineNumber"
+						itemValue="#{landlineNumber}"
+						itemLabel="#{beanHelper.renderPhoneNumber(landlineNumber)}"
+						/>
+				</p:selectOneMenu>
+			</p:panelGrid>
 
 			<div class="para">
 				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 5f24e211..9998fb11 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,11 +6,19 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<core:outputMessageBox panelGroupId="errorHandlerAddLandLine" 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" />
 	</ui:fragment>
 
-	<core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.contact.contactLandLineNumber}" rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}" />
+	<core:outputAdminLandLinePanelGrid
+		landLineNumber="#{beanHelper.contact.contactLandLineNumber}"
+		rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}"
+		/>
 </ui:composition>
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 c69cc57f..9e57a99a 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,12 @@
 	xmlns:p="http://primefaces.org/ui"
 	>
 
-	<core:outputMessageBox panelGroupId="errorHandlerAddMobileContact" 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 rendered="#{not empty beanHelper.contact}">
 		<h:panelGroup layout="block">
@@ -20,35 +25,36 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
 			</div>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
-				</div>
+			<p:panelGrid
+				layout="grid"
+				columns="2"
+				>
+				<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
+				<p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminMobileController.mobileNumber}">
+					<f:converter converterId="MobileNumberConverter" />
 
-				<div class="table-right-medium">
-					<p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
-						<f:converter converterId="MobileNumberConverter" />
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-
-						<f:selectItems
-							value="#{adminPhoneListController.allNonLinkedMobileNumbers}"
-							var="mobileNumber"
-							itemValue="#{mobileNumber}"
-							itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}"
-							/>
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
+					<f:selectItems
+						value="#{adminMobileController.allNonLinkedMobileNumbers}"
+						var="mobileNumber"
+						itemValue="#{mobileNumber}"
+						itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}"
+						/>
+				</p:selectOneMenu>
+			</p:panelGrid>
 
 			<div class="para">
 				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
 			</div>
 
 			<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
-			<core:inputMobileNumberPanelGrid targetController="#{adminPhoneController}" />
+			<core:inputMobileNumberPanelGrid targetController="#{adminMobileController}" />
 
-			<p:panelGrid columns="2" layout="grid">
+			<p:panelGrid
+				layout="grid"
+				columns="2"
+				>
 				<p:commandButton
 					type="reset"
 					value="#{msg.BUTTON_RESET_FORM}"
@@ -56,7 +62,7 @@
 
 				<p:commandButton
 					type="submit"
-					action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}"
+					action="#{adminContactMobileController.doLinkAddMobileNumber(beanHelper.contact)}"
 					value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}"
 					>
 					<f:param name="contactId" value="#{param.contactId}" />
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 bf25e964..b3a3865e 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,11 +6,19 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<core:outputMessageBox panelGroupId="errorHandlerAddMobile" 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" />
 	</ui:fragment>
 
-	<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.contact.contactMobileNumber}" rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}" />
+	<core:outputAdminMobilePanelGrid
+		mobileNumber="#{beanHelper.contact.contactMobileNumber}"
+		rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}"
+		/>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 21719741..faab2b41 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -15,7 +15,13 @@
 	</ui:define>
 
 	<ui:define name="menu">
-		<core:outputMessageBox panelGroupId="errorGuestForbidden" 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/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index e15b9957..26c732d4 100644
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -107,11 +107,21 @@
 					filterBy="#{basicData.companyShortName}"
 					filterMatchMode="contains"
 					>
-					<h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
+					<h:outputLink
+						value="#{basicData.companyWebsiteUrl}"
+						target="_blank"
+						title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}"
+						rel="external"
+						rendered="#{not empty basicData.companyWebsiteUrl}"
+						>
 						<h:outputText value="#{basicData.companyShortName}" />
 					</h:outputLink>
 
-					<h:outputText value="#{basicData.companyShortName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
+					<h:outputText
+						value="#{basicData.companyShortName}"
+						title="#{msg.NO_WEBSITE_URL_ENTERED}"
+						rendered="#{empty basicData.companyWebsiteUrl}"
+						/>
 				</p:column>
 
 				<p:column
@@ -287,6 +297,15 @@
 					<h:outputText value="#{beanHelper.renderPhoneNumber(basicData.companyFaxNumber)}" />
 				</p:column>
 
+				<p:column
+					headerText="#{msg.ROAD_NUMBER_HEADER}"
+					sortBy="#{basicData.companyRoadNumber}"
+					filterBy="#{basicData.companyRoadNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{basicData.companyRoadNumber}" />
+				</p:column>
+
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
 					sortBy="#{basicData.companyEntryCreated}"
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 16433b4f..3d26ed8d 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -41,7 +41,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
+		<h:form
+			rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}"
+			>
 			<h:inputHidden value="#{adminContactPhoneController.contact}" />
 			<h:inputHidden value="#{adminContactPhoneController.phoneId}" />
 
@@ -65,7 +67,12 @@
 				</div>
 
 				<div class="para">
-					<core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
+					<core:outputAdminFaxPanelGrid
+						faxNumber="#{beanHelper.faxNumber}"
+						contact="#{beanHelper.contact}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<p:panelGrid columns="2" layout="grid">
@@ -78,7 +85,11 @@
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}"
+			rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}"
+			>
 			<f:param value="#{adminContactPhoneController.phoneId}" />
 			<f:param value="#{adminContactPhoneController.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 44ccd6f4..d1d29d3e 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -60,7 +60,12 @@
 				</div>
 
 				<div class="para">
-					<core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
+					<core:outputAdminLandLinePanelGrid
+						landLineNumber="#{beanHelper.landLineNumber}"
+						contact="#{beanHelper.contact}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<p:panelGrid columns="2" layout="grid">
@@ -73,7 +78,11 @@
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}"
+			rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}"
+			>
 			<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 1d7d3d08..2bde48f8 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -60,18 +60,27 @@
 				</div>
 
 				<div class="para">
-					<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
+					<core:outputAdminMobilePanelGrid
+						mobileNumber="#{beanHelper.mobileNumber}"
+						contact="#{beanHelper.contact}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<p:commandButton
 					type="submit"
 					value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}"
-					action="#{adminContactPhoneController.unlinkMobileContactData()}"
+					action="#{adminContactMobileController.unlinkMobileContactData()}"
 					/>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}"
+			rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}"
+			>
 			<f:param value="#{beanHelper.mobileNumber.mobileId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index df5534fc..2c98a7d1 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -41,7 +41,11 @@
 				</div>
 
 				<div class="para">
-					<core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminDropdownMenu="false" />
+					<core:outputAdminFaxPanelGrid
+						faxNumber="#{beanHelper.faxNumber}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<div class="para">
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 1c9ed323..79e12d4f 100644
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -240,10 +240,20 @@
 
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{genericProduct.productCreated}"
+					sortBy="#{genericProduct.productEntryCreated}"
 					filterable="false"
 					>
-					<h:outputText value="#{genericProduct.productCreated}">
+					<h:outputText value="#{genericProduct.productEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{genericProduct.productEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{genericProduct.productEntryUpdated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
@@ -380,7 +390,12 @@
 						<h:outputText value="#{product.PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productManufacturer}" />
 
 						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{product.ADMIN_PRODUCT_ENTRY_CREATED_TITLE}" />
-						<h:outputText value="#{productListController.selectedProduct.productCreated}">
+						<h:outputText value="#{productListController.selectedProduct.productEntryCreated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{product.ADMIN_PRODUCT_ENTRY_UPDATED_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productEntryUpdated}">
 							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 						</h:outputText>
 					</p:panelGrid>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index f5600af5..7b97a449 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -32,7 +32,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorHandlerDeleteMobile" 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 rendered="#{not empty beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
@@ -41,7 +46,11 @@
 				</div>
 
 				<div class="para">
-					<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" renderShowLink="false" showAdminDropdownMenu="false" />
+					<core:outputAdminMobilePanelGrid
+						mobileNumber="#{beanHelper.mobileNumber}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<div class="para">
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index e34de433..93a7cb4a 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -95,12 +95,20 @@
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 1697534e..fb6ba37e 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -63,12 +63,20 @@
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index af1ac85f..40111a65 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -123,12 +123,20 @@
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 5f37c3f3..54b4490b 100644
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -44,7 +44,12 @@
 				</h:panelGroup>
 			</h:panelGroup>
 
-			<core:outputMessageBox panelGroupId="errorHandlerConfirmUser" 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>
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 66a2339d..e602e32e 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -19,7 +19,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserListDisabled" 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 e954485e..21bf444e 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -17,7 +17,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserLoginDisabled" 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 d51979cd..a9bb356a 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -18,7 +18,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<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')}" />
+		<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_register.xhtml b/web/guest/user/user_register.xhtml
index 1da89b76..aba81919 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -17,9 +17,19 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserRegistrationDisabled" 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 panelGroupId="errorUserRegistrationIndex" 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 fa04cf53..849730b4 100644
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -13,7 +13,10 @@
 	</ui:define>
 
 	<ui:define name="content_header">
-		<core:outputMessageBox panelGroupId="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 32e1901b..5b7ee595 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -17,7 +17,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserRegistrationMultiDisabled" 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 5b13af3c..2796c0b2 100644
--- a/web/guest/user/user_resend_done.xhtml
+++ b/web/guest/user/user_resend_done.xhtml
@@ -16,6 +16,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="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 c194adfc..f29ae1b7 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -19,7 +19,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserResendLinkDisabled" 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 rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 			<h:panelGroup styleClass="table" layout="block">
@@ -38,7 +43,14 @@
 						</div>
 
 						<div class="table-right">
-							<p:inputText id="emailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+							<p:inputText
+								id="emailAddress"
+								size="20"
+								maxlength="255"
+								value="#{userResendConfirmationController.emailAddress}"
+								required="true"
+								requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}"
+								>
 								<validator:emailAddressValidator />
 							</p:inputText>
 						</div>
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 354e7a2e..0c6f662b 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -17,9 +17,18 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<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
+			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 panelGroupId="errorUserEditDataDisabled" 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
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 6c6972e3..91afff19 100644
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -16,7 +16,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="loginUserDataSaved" 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 dc472a32..78d70dd5 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -17,9 +17,18 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserChangeEmailDisabled" 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')}">
+		<h:panelGroup
+			styleClass="table"
+			layout="block"
+			rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}"
+			>
 			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
 			</div>
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index d5c4ca5c..f18f7277 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -17,9 +17,18 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="loginUserMustChangePassword" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
-
-		<core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+		<core:outputMessageBox
+			panelGroupId="loginUserMustChangePassword"
+			message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}"
+			rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}"
+			/>
+
+		<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 7b5c18de..445cf895 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -17,7 +17,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<core:outputMessageBox panelGroupId="errorUserEditDataDisabled" 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"
@@ -54,7 +59,7 @@
 
 					<p:commandButton
 						value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}"
-						action="#{userController.doChangePersonalData()}"
+						action="#{userActionController.doChangePersonalData()}"
 						/>
 				</p:panelGrid>
 			</h:form>
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index b19c5b92..95e19e52 100644
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -17,9 +17,18 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<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
+			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 panelGroupId="errorUserEditDataDisabled" 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"
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 4c0b9e1d..dd461a19 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -17,7 +17,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<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'))}" />
+		<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'))}"
+			/>
 
 		<p:link
 			outcome="user_change_password"
-- 
2.39.5