From: Roland Häder <roland@mxchange.org>
Date: Sun, 14 May 2023 01:11:14 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3330e067a40bc6b273bf6c10529ace464219b5ab;p=pizzaservice-war.git

Please cherry-pick:
- let's have each attribute in a new line
---

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 0659db91..3c78b683 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
@@ -19,10 +19,22 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
 			</div>
 
+<<<<<<< HEAD
 			<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
+					id="mobileNumber"
+					value="#{adminMobileController.mobileNumber}"
+					>
+>>>>>>> 6774350c5 (Please cherry-pick:)
 
 				<div class="table-right-medium">
 					<p:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index 5d02a85d..d99b94d7 100644
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -15,7 +17,15 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" emptyMessage="#{msg.ADMIN_CONTACT_MOBILE_LIST_EMPTY}">
+		<p:dataTable
+			id="table_list_mobiles"
+			var="mobile"
+			value="#{phoneListController.allMobileNumbers}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}"
+			emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT_MOBILE}"
+			>
 			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index f9a73c63..43f4982b 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -1,18 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="phoneId" value="#{adminPhoneController.mobileNumber}" 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:viewParam
+				name="mobileId"
+				value="#{adminMobileController.mobileNumber}"
+				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:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 5f98227e..7b97a449 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<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}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+			<f:viewParam
+				name="mobileId"
+				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.notifyControllerMobileNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,25 +32,36 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets: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:form rendered="#{not empty beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminMobilePanelGrid
+						mobileNumber="#{beanHelper.mobileNumber}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<div class="para">
 					<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}"
+					action="#{adminMobileController.deleteMobileData()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 61a57ae5..2cd6db14 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<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}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+			<f:viewParam
+				name="mobileId"
+				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.notifyControllerMobileNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,22 +32,28 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-mobile-number" 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 styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.mobileNumber}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
-						<f:param value="#{beanHelper.mobileNumber.phoneId}" />
+						<f:param value="#{beanHelper.mobileNumber.mobileId}" />
 					</h:outputFormat>
 				</div>
 
-				<widgets:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
+				<core:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" id="button_edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}"
+						action="#{adminMobileController.doUpdateMobileNumber()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index cac23e37..1ab86f42 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -16,14 +17,26 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_mobile" var="mobileNumber" value="#{phoneController.allMobileNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" emptyMessage="#{msg.ADMIN_MOBILE_NUMBER_LIST_EMPTY}">
+		<p:dataTable
+			id="mobileNumberList"
+			var="mobileNumber"
+			value="#{mobileListController.allMobileNumbers}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}"
+			emptyMessage="#{msg.ADMIN_EMPTY_LIST_MOBILE_NUMBER}"
+			>
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+				<p:link
+					outcome="admin_show_mobile"
+					value="#{mobileNumber.mobileId}"
+					title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}"
+					>
+					<f:param name="mobileId" value="#{mobileNumber.mobileId}" />
 				</p:link>
 			</p:column>
 
@@ -32,7 +45,11 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
+				<p:link
+					outcome="admin_show_mobile_provider"
+					value="#{mobileNumber.mobileProvider.providerName}"
+					title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+					>
 					<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
 				</p:link>
 			</p:column>
@@ -42,25 +59,25 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 				</f:facet>
 
-				<h:outputText value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
+				<h:outputText value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+					<h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{mobileNumber.phoneEntryCreated.time}">
+				<h:outputText value="#{mobileNumber.mobileEntryCreated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+					<h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{mobileNumber.phoneEntryUpdated.time}">
+				<h:outputText value="#{mobileNumber.mobileEntryUpdated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 7ee27039..fcffc2dc 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<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}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+			<f:viewParam
+				name="mobileId"
+				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.notifyControllerMobileNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,19 +32,29 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
-
-		<p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
+
+		<p:dataTable
+			id="contact_mobile_link"
+			var="contact"
+			value="#{contactMobileController.allCurrentMobileNumberContacts()}"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+			>
 			<f:facet name="header">
-				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
-					<f:param value="#{beanHelper.mobileNumber.phoneId}" />
+				<h:outputFormat value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER}">
+					<f:param value="#{beanHelper.mobileNumber.mobileId}" />
 				</h:outputFormat>
 			</f:facet>
 
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link
+					id="contactId"
+					styleClass="table-data-field"
+					outcome="admin_show_contact"
+					value="#{contact.contactId}"
+					>
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
 			</p:column>
@@ -67,25 +86,31 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
-				</h:outputLink>
+				</p:link>
 			</p:column>
 
 			<p:column>
 				<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-				<div class="table-data-field">
+				<p:outputPanel styleClass="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_mobile">
+							<p:link
+								outcome="admin_unlink_contact_mobile"
+								>
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
-								<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+								<f:param name="mobileId" value="#{beanHelper.mobileNumber.mobileId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</p:link>
 						</li>
 					</ul>
-				</div>
+				</p:outputPanel>
 			</p:column>
 		</p:dataTable>
 	</ui:define>