From: Roland Häder <roland@mxchange.org>
Date: Wed, 17 Aug 2016 12:35:15 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2767e7c78c6e0ddad7a547a89750661263f71482;p=jjobs-war.git

Please cherry-pick:
- these pages are not only fax/land-line/mobile related, they are both contact and fax/...
---

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 62dd5c27..841590f1 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -317,7 +317,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_mobile</from-outcome>
-			<to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_mobile_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_mobile</from-outcome>
@@ -333,7 +333,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_fax</from-outcome>
-			<to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_fax</from-outcome>
@@ -349,7 +349,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_landline</from-outcome>
-			<to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_landline_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_landline</from-outcome>
@@ -400,7 +400,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_mobile</from-outcome>
-			<to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_mobile_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile</from-outcome>
@@ -416,7 +416,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_fax</from-outcome>
-			<to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
+			<to-view-id>/admincontact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_fax</from-outcome>
@@ -432,7 +432,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_landline</from-outcome>
-			<to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_landline_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_landline</from-outcome>
@@ -496,7 +496,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_fax</from-outcome>
-			<to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
@@ -515,7 +515,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_landline</from-outcome>
-			<to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_landline_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
@@ -538,7 +538,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_mobile</from-outcome>
-			<to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_mobile_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
@@ -568,21 +568,21 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</from-view-id>
+		<from-view-id>/admincontact/unlink/admin_contact_fax_unlink.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</from-view-id>
+		<from-view-id>/admin/contact/unlink/admin_contact_landline_unlink.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</from-view-id>
+		<from-view-id>/admin/contact/unlink/admin_contact_mobile_unlink.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
new file mode 100644
index 00000000..65bac3a5
--- /dev/null
+++ b/web/admin/contact/unlink/admin_contact_fax_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.faxNumber}" converter="FaxConverter" 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_FAX_NUMBER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.faxNumber}">
+				<h:panelGroup styleClass="table" layout="block">
+					<div class="table_header">
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_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/landline/admin_landline_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_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.faxNumber}">
+				<f:param value="#{beanHelper.faxNumber.phoneId}" />
+				<f:param value="#{beanHelper.contact.contactId}" />
+			</h:outputFormat>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
new file mode 100644
index 00000000..639004d1
--- /dev/null
+++ b/web/admin/contact/unlink/admin_contact_landline_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.landLineNumber}" converter="LandLineConverter" 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_LAND_LINE_NUMBER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.landLineNumber}">
+				<h:panelGroup styleClass="table" layout="block">
+					<div class="table_header">
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_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/landline/admin_landline_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_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.landLineNumber}">
+				<f:param value="#{beanHelper.landLineNumber.phoneId}" />
+				<f:param value="#{beanHelper.contact.contactId}" />
+			</h:outputFormat>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
new file mode 100644
index 00000000..db3eb0be
--- /dev/null
+++ b/web/admin/contact/unlink/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.mobileNumber}" 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_NUMBER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
+				<h:panelGroup styleClass="table" layout="block">
+					<div class="table_header">
+						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_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_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+
+			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
+				<f:param value="#{beanHelper.mobileNumber.phoneId}" />
+				<f:param value="#{beanHelper.contact.contactId}" />
+			</h:outputFormat>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/fax/admin_contact_fax_unlink.xhtml b/web/admin/fax/admin_contact_fax_unlink.xhtml
deleted file mode 100644
index 65bac3a5..00000000
--- a/web/admin/fax/admin_contact_fax_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.faxNumber}" converter="FaxConverter" 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_FAX_NUMBER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.faxNumber}">
-				<h:panelGroup styleClass="table" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_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/landline/admin_landline_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_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-					</div>
-				</h:panelGroup>
-			</h:form>
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.faxNumber}">
-				<f:param value="#{beanHelper.faxNumber.phoneId}" />
-				<f:param value="#{beanHelper.contact.contactId}" />
-			</h:outputFormat>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/landline/admin_contact_landline_unlink.xhtml b/web/admin/landline/admin_contact_landline_unlink.xhtml
deleted file mode 100644
index 639004d1..00000000
--- a/web/admin/landline/admin_contact_landline_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.landLineNumber}" converter="LandLineConverter" 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_LAND_LINE_NUMBER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.landLineNumber}">
-				<h:panelGroup styleClass="table" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_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/landline/admin_landline_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_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-					</div>
-				</h:panelGroup>
-			</h:form>
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.landLineNumber}">
-				<f:param value="#{beanHelper.landLineNumber.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
deleted file mode 100644
index db3eb0be..00000000
--- a/web/admin/mobile/admin_contact_mobile_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.mobileNumber}" 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_NUMBER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
-				<h:panelGroup styleClass="table" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_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_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-					</div>
-				</h:panelGroup>
-			</h:form>
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
-
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
-				<f:param value="#{beanHelper.mobileNumber.phoneId}" />
-				<f:param value="#{beanHelper.contact.contactId}" />
-			</h:outputFormat>
-		</ui:define>
-	</ui:composition>
-</html>