From 2767e7c78c6e0ddad7a547a89750661263f71482 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 17 Aug 2016 14:35:15 +0200
Subject: [PATCH] Please cherry-pick: - these pages are not only
 fax/land-line/mobile related, they are both contact and fax/...

---
 web/WEB-INF/faces-config.xml                  | 24 +++++++++----------
 .../unlink}/admin_contact_fax_unlink.xhtml    |  0
 .../admin_contact_landline_unlink.xhtml       |  0
 .../unlink}/admin_contact_mobile_unlink.xhtml |  0
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename web/admin/{fax => contact/unlink}/admin_contact_fax_unlink.xhtml (100%)
 rename web/admin/{landline => contact/unlink}/admin_contact_landline_unlink.xhtml (100%)
 rename web/admin/{mobile => contact/unlink}/admin_contact_mobile_unlink.xhtml (100%)

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/fax/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
similarity index 100%
rename from web/admin/fax/admin_contact_fax_unlink.xhtml
rename to web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
diff --git a/web/admin/landline/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
similarity index 100%
rename from web/admin/landline/admin_contact_landline_unlink.xhtml
rename to web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
similarity index 100%
rename from web/admin/mobile/admin_contact_mobile_unlink.xhtml
rename to web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
-- 
2.39.5