From 78f8158afceccd5412198f1a4b7a4273a83b8473 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 17 Jul 2017 14:00:53 +0200
Subject: [PATCH] Please cherry-pick: - cleanups in JSF, some missing helper
 calls added, still I need to   figure out where to put <f:metadata> correctly
 ... :-/
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/admin/contact/admin_contact_delete.xhtml       | 12 +++++-------
 web/admin/contact/admin_contact_edit.xhtml         | 12 +++++-------
 web/admin/contact/admin_contact_show.xhtml         | 12 +++++-------
 .../contact/unlink/admin_contact_fax_unlink.xhtml  | 12 +++++-------
 .../unlink/admin_contact_landline_unlink.xhtml     | 12 +++++-------
 .../unlink/admin_contact_mobile_unlink.xhtml       | 10 ++++------
 web/admin/fax/admin_fax_delete.xhtml               | 11 +++++------
 web/admin/fax/admin_fax_edit.xhtml                 | 12 +++++-------
 web/admin/fax/admin_fax_show.xhtml                 | 11 +++++------
 web/admin/landline/admin_landline_delete.xhtml     | 11 +++++------
 web/admin/landline/admin_landline_edit.xhtml       | 12 +++++-------
 web/admin/landline/admin_landline_show.xhtml       | 11 +++++------
 web/admin/mobile/admin_contact_mobile_unlink.xhtml |  4 ++--
 web/admin/mobile/admin_mobile_delete.xhtml         |  9 ++++-----
 web/admin/mobile/admin_mobile_edit.xhtml           | 10 ++++------
 web/admin/mobile/admin_mobile_show.xhtml           |  9 ++++-----
 web/admin/user/admin_user_activity_log.xhtml       | 12 +++++-------
 web/admin/user/admin_user_delete.xhtml             | 12 +++++-------
 web/admin/user/admin_user_edit.xhtml               | 12 +++++-------
 web/admin/user/admin_user_lock.xhtml               | 12 +++++-------
 .../user/admin_user_resend_confirmation_link.xhtml | 10 ++++------
 web/admin/user/admin_user_show.xhtml               | 12 +++++-------
 web/admin/user/admin_user_unlock.xhtml             | 10 ++++------
 web/guest/user/user_confirm_account.xhtml          | 12 +++++-------
 web/guest/user/user_profile.xhtml                  | 14 +++++---------
 25 files changed, 116 insertions(+), 160 deletions(-)

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index d9debf2f..81e28bf0 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -8,14 +8,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-				<f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
 		</ui:define>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 0f9c851b..e0ea8d77 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -8,14 +8,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-				<f:viewAction action="#{beanHelper.copyContactToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyContactToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
 		</ui:define>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index b28cf7a5..9ae9fd10 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -8,14 +8,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-				<f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
 		</ui:define>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 92b938f3..53dc21cb 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-				<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
 		</ui:define>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 83c4aec9..cc02f580 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-				<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
 		</ui:define>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index ef2a67d5..90ab08c2 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -7,12 +7,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:define name="metadata">
-		<f:metadata>
-			<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-		</f:metadata>
-	</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 6c575941..af152042 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -7,13 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
 		</ui:define>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 984dcfe2..c7067b07 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-				<f:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
 		</ui:define>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 2c5f755f..7d3579bc 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -7,13 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
 		</ui:define>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index a3a1bbba..2d899f74 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -7,13 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
 		</ui:define>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index ce87dc57..e524a72f 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-				<f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
 		</ui:define>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index b36826bd..12f321ff 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -7,13 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
 		</ui:define>
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index 3c4bb59d..c6858c46 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -8,8 +8,8 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+		<f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index de23aa3f..61b20191 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -7,11 +7,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:define name="metadata">
-		<f:metadata>
-			<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-		</f:metadata>
-	</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 88328ed0..67982d91 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -7,12 +7,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:define name="metadata">
-		<f:metadata>
-			<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			<f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-		</f:metadata>
-	</ui:define>
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 841bd93b..465a77cc 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -7,19 +7,18 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:define name="metadata">
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<f:metadata>
-			<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+			<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
 		</f:metadata>
-	</ui:define>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 862dcc1d..88ff48a3 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-				<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
 		</ui:define>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 2e927990..7a2802b8 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,14 +8,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-				<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
 		</ui:define>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 8a706644..174b1a98 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-				<f:viewAction action="#{beanHelper.copyUserToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
 		</ui:define>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index b39945f4..3923130f 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-				<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
 		</ui:define>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 036f97cc..7544cb04 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -7,12 +7,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:define name="metadata">
-		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-		</f:metadata>
-	</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index f3b9812a..5e63d6a2 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -8,14 +8,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-				<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
 			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
 		</ui:define>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index b7c91b4a..8988b3bb 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -8,12 +8,10 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:define name="metadata">
-		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-		</f:metadata>
-	</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index a49b6eaa..81dea8eb 100644
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -7,14 +7,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-				<f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
+		<f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="guest_title">
 			<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
 		</ui:define>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index db10a2fc..dd7a61e9 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -7,16 +7,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
-					<f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-					<f:validator for="userId" validatorId="UserIdValidator" />
-				</f:viewParam>
-			</f:metadata>
-		</ui:define>
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+		<f:viewAction action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
 
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
 		<ui:define name="login_title">
 			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
 		</ui:define>
-- 
2.39.5