From: Roland Häder <roland@mxchange.org>
Date: Tue, 16 Aug 2016 09:58:31 +0000 (+0200)
Subject: renamed after new way (cellphone -> mobile)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fbf4e35c29b7616da830ca1e756c209006bf3abf;p=jjobs-war.git

renamed after new way (cellphone -> mobile)
---

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
deleted file mode 100644
index 76d703b0..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-	<ui:fragment rendered="#{empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
-	</ui:fragment>
-
-	<ui:fragment rendered="#{not empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
deleted file mode 100644
index 3735c905..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
-
-	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.cellPhoneNumber}">
-		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
-		</f:facet>
-
-		<h:column>
-			<h:panelGroup>
-				<h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
-
-				<h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-
-				<h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
-			</h:panelGroup>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
-
-			<h:link outcome="admin_show_mobile_provider">
-				<f:param name="providerId" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerId}" />
-				<h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerName}" />
-			</h:link>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
-
-			<h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.mobileProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
-		</h:column>
-
-		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
-
-			<div class="table_data_field">
-				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
-			</div>
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
deleted file mode 100644
index 098677e9..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
-
-	<ui:fragment rendered="#{not empty beanHelper.cellPhoneNumber}">
-		<ul class="mini_nav">
-			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="mini_link">
-					<h:link outcome="admin_show_mobile">
-						<h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="mini_link">
-				<h:link outcome="admin_edit_mobile">
-					<h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-				</h:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="mini_link">
-					<h:link outcome="admin_unlink_contact_mobile">
-						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="mini_link">
-				<h:link outcome="admin_delete_mobile">
-					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-				</h:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl
deleted file mode 100644
index 461a2c67..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-	<h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
-				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE}" />
-			</div>
-
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="choosenCellphoneNumber" value="#{msg.ADMIN_SELECT_MOBILE}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="choosenCellphoneNumber" value="#{adminPhoneController.choosenCellphoneNumber}">
-						<f:converter converterId="MobileConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
-					</h:selectOneMenu>
-				</div>
-			</div>
-
-			<div class="para">
-				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
-				</div>
-
-				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
-						<ui:param name="targetController" value="#{adminPhoneController}" />
-					</ui:include>
-				</div>
-			</div>
-
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddCellphone(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE}" />
-			</div>
-		</h:panelGroup>
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
deleted file mode 100644
index 59e5b24f..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
-
-	<div class="para">
-		<fieldset class="fieldset" id="phone_data">
-			<legend title="#{msg.ADMIN_MOBILE_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_MOBILE_DATA_LEGEND}" />
-			</legend>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:outputText id="mobileNumberId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
-						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</h:selectOneMenu>
-				</div>
-
-				<div class="clear"></div>
-
-				<div class="error_container">
-					<h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-
-				<div class="error_container">
-					<h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</div>
-			</div>
-		</fieldset>
-	</div>
-</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
new file mode 100644
index 00000000..461a2c67
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+	<h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
+		<h:panelGroup styleClass="table_medium" layout="block">
+			<div class="table_header">
+				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE}" />
+			</div>
+
+			<div class="para">
+				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="choosenCellphoneNumber" value="#{msg.ADMIN_SELECT_MOBILE}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:selectOneMenu styleClass="select right_space" id="choosenCellphoneNumber" value="#{adminPhoneController.choosenCellphoneNumber}">
+						<f:converter converterId="MobileConverter" />
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
+					</h:selectOneMenu>
+				</div>
+			</div>
+
+			<div class="para">
+				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+				</div>
+
+				<div class="table_right_medium">
+					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminPhoneController}" />
+					</ui:include>
+				</div>
+			</div>
+
+			<div class="table_footer">
+				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddCellphone(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE}" />
+			</div>
+		</h:panelGroup>
+	</h:form>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
new file mode 100644
index 00000000..59e5b24f
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+
+	<div class="para">
+		<fieldset class="fieldset" id="phone_data">
+			<legend title="#{msg.ADMIN_MOBILE_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_MOBILE_DATA_LEGEND}" />
+			</legend>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:outputText id="mobileNumberId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
+						<f:converter converterId="MobileProviderConverter" />
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+					</h:selectOneMenu>
+				</div>
+
+				<div class="clear"></div>
+
+				<div class="error_container">
+					<h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+
+				<div class="error_container">
+					<h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
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
new file mode 100644
index 00000000..76d703b0
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+	<ui:fragment rendered="#{empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
+	</ui:fragment>
+
+	<ui:fragment rendered="#{not empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
new file mode 100644
index 00000000..3735c905
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+
+	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.cellPhoneNumber}">
+		<f:facet name="header">
+			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
+		</f:facet>
+
+		<h:column>
+			<h:panelGroup>
+				<h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+
+				<h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+
+				<h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+
+			<h:link outcome="admin_show_mobile_provider">
+				<f:param name="providerId" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerId}" />
+				<h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerName}" />
+			</h:link>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+
+			<h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.mobileProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
+		</h:column>
+
+		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+			<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
+
+			<div class="table_data_field">
+				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
+					<ui:param name="isShowPage" value="#{isShowPage}" />
+				</ui:include>
+			</div>
+		</h:column>
+	</h:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
new file mode 100644
index 00000000..098677e9
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+
+	<ui:fragment rendered="#{not empty beanHelper.cellPhoneNumber}">
+		<ul class="mini_nav">
+			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
+				<li class="mini_link">
+					<h:link outcome="admin_show_mobile">
+						<h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="mini_link">
+				<h:link outcome="admin_edit_mobile">
+					<h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+				</h:link>
+			</li>
+
+			<ui:fragment rendered="#{not empty beanHelper.contact}">
+				<li class="mini_link">
+					<h:link outcome="admin_unlink_contact_mobile">
+						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="mini_link">
+				<h:link outcome="admin_delete_mobile">
+					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+				</h:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml
deleted file mode 100644
index 721ecfba..00000000
--- a/web/admin/cellphone/admin_cellphone_delete.xhtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	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"
-	>
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_delete_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
-				<h:panelGroup styleClass="table" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
-					</div>
-
-					<div class="para">
-						<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-							<ui:param name="isShowPage" value="#{false}" />
-							<ui:param name="showAdminLinks" value="#{false}" />
-						</ui:include>
-					</div>
-
-					<div class="para">
-						<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
-					</div>
-
-					<div class="table_footer">
-						<h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE}" action="#{adminPhoneController.deleteMobileData()}" />
-					</div>
-				</h:panelGroup>
-			</h:form>
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml
deleted file mode 100644
index 59293a73..00000000
--- a/web/admin/cellphone/admin_cellphone_edit.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	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"
-	>
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-		<f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_edit_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
-				<h:panelGroup styleClass="table_medium" layout="block">
-					<div class="table_header">
-						#{msg.ADMIN_EDIT_MOBILE_TITLE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE}" action="#{adminPhoneController.editMobileData()}" />
-					</div>
-				</h:panelGroup>
-			</h:form>
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/cellphone/admin_cellphone_list.xhtml b/web/admin/cellphone/admin_cellphone_list.xhtml
deleted file mode 100644
index 4026710a..00000000
--- a/web/admin/cellphone/admin_cellphone_list.xhtml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	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">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
-					</f:facet>
-
-					<h:link outcome="admin_show_mobile">
-						<h:outputText value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{mobile.phoneId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
-					</f:facet>
-
-					<h:link outcome="admin_show_mobile_provider">
-						<f:param name="providerId" value="#{mobile.mobileProvider.providerId}" />
-						<h:outputText value="#{mobile.mobileProvider.providerName}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
-					</f:facet>
-
-					<h:outputText value="#{mobile.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobile.mobileProvider.providerDialPrefix}-#{mobile.phoneNumber}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_CREATED}" />
-					</f:facet>
-
-					<h:outputText value="#{mobile.phoneEntryCreated.time}">
-						<f:convertDateTime type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_UPDATED}" />
-					</f:facet>
-
-					<h:outputText value="#{mobile.phoneEntryUpdated.time}">
-						<f:convertDateTime type="both" />
-					</h:outputText>
-				</h:column>
-			</h:dataTable>
-
-			<h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml
deleted file mode 100644
index 3823a92c..00000000
--- a/web/admin/cellphone/admin_cellphone_show.xhtml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	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"
-	>
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-				<ui:param name="isShowPage" value="#{true}" />
-			</ui:include>
-
-			<h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
-				<f:facet name="header">
-					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_LINKS}">
-						<f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
-					</h:outputFormat>
-				</f:facet>
-
-				<h:column>
-					<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-					<h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact">
-						<h:outputText value="#{contact.contactId}" />
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
-
-					<h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
-
-					<h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-					<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-					<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-					<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
-						<h:outputText value="#{contact.contactEmailAddress}" />
-					</h:outputLink>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_UNLINK}" />
-
-					<div class="table_data_field">
-						<ul class="mini_nav">
-							<li class="mini_link">
-								<h:link outcome="admin_unlink_contact_mobile">
-									<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-									<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
-									<f:param name="contactId" value="#{contact.contactId}" />
-								</h:link>
-							</li>
-						</ul>
-					</div>
-				</h:column>
-			</h:dataTable>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
deleted file mode 100644
index 55946ea2..00000000
--- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	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"
-	>
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" 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:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.cellPhoneNumber}">
-				<h:panelGroup styleClass="table" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
-					</div>
-
-					<div class="para">
-						<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-					</div>
-
-					<div class="para">
-						<h:link outcome="admin_show_contact">
-							<h:outputText value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}" />
-							<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-						</h:link>
-					</div>
-
-					<div class="para">
-						<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-							<ui:param name="isShowPage" value="#{false}" />
-							<ui:param name="showAdminLinks" value="#{false}" />
-						</ui:include>
-					</div>
-
-					<div class="table_footer">
-						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_MOBILE}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-					</div>
-				</h:panelGroup>
-			</h:form>
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.cellPhoneNumber}">
-				<f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
-				<f:param value="#{beanHelper.contact.contactId}" />
-			</h:outputFormat>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
new file mode 100644
index 00000000..55946ea2
--- /dev/null
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	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"
+	>
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" 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:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.cellPhoneNumber}">
+				<h:panelGroup styleClass="table" layout="block">
+					<div class="table_header">
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
+					</div>
+
+					<div class="para">
+						<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
+					</div>
+
+					<div class="para">
+						<h:link outcome="admin_show_contact">
+							<h:outputText value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}" />
+							<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+						</h:link>
+					</div>
+
+					<div class="para">
+						<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
+							<ui:param name="isShowPage" value="#{false}" />
+							<ui:param name="showAdminLinks" value="#{false}" />
+						</ui:include>
+					</div>
+
+					<div class="table_footer">
+						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_MOBILE}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.cellPhoneNumber}">
+				<f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
+				<f:param value="#{beanHelper.contact.contactId}" />
+			</h:outputFormat>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
new file mode 100644
index 00000000..721ecfba
--- /dev/null
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	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"
+	>
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form id="form_delete_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
+				<h:panelGroup styleClass="table" layout="block">
+					<div class="table_header">
+						<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
+					</div>
+
+					<div class="para">
+						<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
+							<ui:param name="isShowPage" value="#{false}" />
+							<ui:param name="showAdminLinks" value="#{false}" />
+						</ui:include>
+					</div>
+
+					<div class="para">
+						<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
+					</div>
+
+					<div class="table_footer">
+						<h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE}" action="#{adminPhoneController.deleteMobileData()}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
new file mode 100644
index 00000000..59293a73
--- /dev/null
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	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"
+	>
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form id="form_edit_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
+				<h:panelGroup styleClass="table_medium" layout="block">
+					<div class="table_header">
+						#{msg.ADMIN_EDIT_MOBILE_TITLE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE}" action="#{adminPhoneController.editMobileData()}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
new file mode 100644
index 00000000..4026710a
--- /dev/null
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	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">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+					</f:facet>
+
+					<h:link outcome="admin_show_mobile">
+						<h:outputText value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{mobile.phoneId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+					</f:facet>
+
+					<h:link outcome="admin_show_mobile_provider">
+						<f:param name="providerId" value="#{mobile.mobileProvider.providerId}" />
+						<h:outputText value="#{mobile.mobileProvider.providerName}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+					</f:facet>
+
+					<h:outputText value="#{mobile.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobile.mobileProvider.providerDialPrefix}-#{mobile.phoneNumber}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_CREATED}" />
+					</f:facet>
+
+					<h:outputText value="#{mobile.phoneEntryCreated.time}">
+						<f:convertDateTime type="both" />
+					</h:outputText>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_UPDATED}" />
+					</f:facet>
+
+					<h:outputText value="#{mobile.phoneEntryUpdated.time}">
+						<f:convertDateTime type="both" />
+					</h:outputText>
+				</h:column>
+			</h:dataTable>
+
+			<h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
new file mode 100644
index 00000000..3823a92c
--- /dev/null
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -0,0 +1,92 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	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"
+	>
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
+				<ui:param name="isShowPage" value="#{true}" />
+			</ui:include>
+
+			<h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+				<f:facet name="header">
+					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_LINKS}">
+						<f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:column>
+					<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+					<h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact">
+						<h:outputText value="#{contact.contactId}" />
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+
+					<h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+
+					<h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+					<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+					<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+					<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+						<h:outputText value="#{contact.contactEmailAddress}" />
+					</h:outputLink>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_UNLINK}" />
+
+					<div class="table_data_field">
+						<ul class="mini_nav">
+							<li class="mini_link">
+								<h:link outcome="admin_unlink_contact_mobile">
+									<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+									<f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+									<f:param name="contactId" value="#{contact.contactId}" />
+								</h:link>
+							</li>
+						</ul>
+					</div>
+				</h:column>
+			</h:dataTable>
+		</ui:define>
+	</ui:composition>
+</html>