X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ffaces-config.xml;h=e8e7be87685afd1101d6a3726a9b73dacc4b565b;hb=09c17cd0daabd9b7278aacd72aea5e31d2ae82a7;hp=a8068810ebe81ba9a49f14c5ffcbcbb6e3ceb9d2;hpb=b8b8bc1bbb84f4080d775178d48eb84d992f12a5;p=jjobs-war.git

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index a8068810..e8e7be87 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -9,6 +9,11 @@
 			<supported-locale>en_US</supported-locale>
 		</locale-config>
 	</application>
+	<!--
+	<lifecycle>
+		<phase-listener>org.mxchange.jjobs.debug.JobsDebugLifeCycleListener</phase-listener>
+	</lifecycle>
+	//-->
 	<navigation-rule>
 		<from-view-id>*</from-view-id>
 		<navigation-case>
@@ -21,15 +26,15 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_register</from-outcome>
-			<to-view-id>/guest/user/register.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_register.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_login</from-outcome>
-			<to-view-id>/guest/user/login.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_login.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>user_lost_passwd</from-outcome>
-			<to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
+			<from-outcome>user_lost_password</from-outcome>
+			<to-view-id>/guest/user/user_lost_password.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>terms</from-outcome>
@@ -47,6 +52,10 @@
 			<from-outcome>logout</from-outcome>
 			<to-view-id>/logout.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_logout</from-outcome>
+			<to-view-id>/admin/admin_logout.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_index</from-outcome>
 			<to-view-id>/admin/index.xhtml</to-view-id>
@@ -57,11 +66,19 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_resend_link</from-outcome>
-			<to-view-id>/guest/user/resend_link.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_resend_link.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>login_edit_user_data</from-outcome>
-			<to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+			<from-outcome>user_change_email_address</from-outcome>
+			<to-view-id>/user/login_change_email_address.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>user_change_password</from-outcome>
+			<to-view-id>/user/login_change_password.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>user_change_personal_data</from-outcome>
+			<to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_profile</from-outcome>
@@ -91,6 +108,14 @@
 			<from-outcome>admin_export_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_business_contacts</from-outcome>
+			<to-view-id>/admin/business_contacts/admin_business_contacts_list.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_export_business_contacts</from-outcome>
+			<to-view-id>/admin/business_contacts/admin_business_contacts_export.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
@@ -129,17 +154,24 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
+		<from-view-id>/user/login_index.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>user_change_password</from-outcome>
+			<to-view-id>/user/login_change_password.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/guest/user/user_login.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>login</from-outcome>
+			<from-outcome>login_user</from-outcome>
 			<to-view-id>/user/login_index.xhtml</to-view-id>
 			<redirect>1</redirect>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/resend_link.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>login</from-outcome>
+			<from-outcome>user_login</from-outcome>
 			<to-view-id>/login/login_index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -152,81 +184,48 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>login</from-outcome>
-			<to-view-id>/user/login_index.xhtml</to-view-id>
-		</navigation-case>
+		<from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>admin_add_user</from-outcome>
-			<to-view-id>/admin/admin_user_add.xhtml</to-view-id>
+			<from-outcome>user_resend_done</from-outcome>
+			<to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>user_user</from-outcome>
-			<to-view-id>/user/login_index.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/guest/user/resend_link.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>resend_done</from-outcome>
-			<to-view-id>/guest/user/resend_done.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/register.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_register.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>register_done</from-outcome>
-			<to-view-id>/guest/user/register_done.xhtml</to-view-id>
+			<from-outcome>user_register_done</from-outcome>
+			<to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>register_page2</from-outcome>
-			<to-view-id>/guest/user/register_page2.xhtml</to-view-id>
+			<from-outcome>user_register_page2</from-outcome>
+			<to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_logout.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_register_page2.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>index</from-outcome>
-			<to-view-id>/index.xhtml</to-view-id>
+			<from-outcome>user_register_done</from-outcome>
+			<to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>user_add_addressbook</from-outcome>
-			<to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>user_change_email_address</from-outcome>
-			<to-view-id>/user/login_change_email_address.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>user_change_password</from-outcome>
-			<to-view-id>/user/login_change_password.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>user_change_personal_data</from-outcome>
-			<to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/user/login_change_password.xhtml</from-view-id>
+		<from-view-id>/user/login_user_change_password.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>user_data_saved</from-outcome>
-			<to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
+			<to-view-id>/user/login_data_saved.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/user/login_change_email_address.xhtml</from-view-id>
+		<from-view-id>/user/login_user_change_email_address.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>contact_data_saved</from-outcome>
+			<from-outcome>user_contact_data_saved</from-outcome>
 			<to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -235,14 +234,10 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
+		<from-view-id>/user/login_user_change_personal_data.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>contact_data_saved</from-outcome>
-			<to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>admin_delete_category</from-outcome>
-			<to-view-id>/admin/admin_category_delete.xhtml</to-view-id>
+			<from-outcome>user_data_saved</from-outcome>
+			<to-view-id>/user/login_data_saved.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -255,6 +250,10 @@
 			<from-outcome>admin_delete_country</from-outcome>
 			<to-view-id>/admin/country/admin_country_delete.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_country</from-outcome>
+			<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
+		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</from-view-id>
@@ -278,6 +277,17 @@
 			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/user/admin_user_delete.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_user</from-outcome>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_user</from-outcome>
+			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/user/admin_user_list.xhtml</from-view-id>
 		<navigation-case>
@@ -317,12 +327,44 @@
 		</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>
 			<to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_show_fax</from-outcome>
+			<to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_fax</from-outcome>
+			<to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_unlink_contact_fax</from-outcome>
+			<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>
+			<to-view-id>/admin/fax/admin_fax_delete.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_show_landline</from-outcome>
+			<to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_landline</from-outcome>
+			<to-view-id>/admin/landline/admin_landline_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_unlink_contact_landline</from-outcome>
+			<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>
+			<to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
@@ -331,6 +373,10 @@
 			<from-outcome>admin_delete_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_resend_user_confirm_link</from-outcome>
+			<to-view-id>/admin/user/admin_user_resend_confirmation_link.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_lock_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_lock.xhtml</to-view-id>
@@ -339,10 +385,18 @@
 			<from-outcome>admin_unlock_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_show_user_activity_log</from-outcome>
+			<to-view-id>/admin/user/admin_user_activity_log.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
 		</navigation-case>
+		<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/contact/admin_contact_show.xhtml</from-view-id>
@@ -358,6 +412,22 @@
 			<from-outcome>admin_show_mobile_provider</from-outcome>
 			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_mobile</from-outcome>
+			<to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_mobile</from-outcome>
+			<to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_unlink_contact_mobile</from-outcome>
+			<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>
+			<to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_fax</from-outcome>
 			<to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
@@ -368,7 +438,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_fax</from-outcome>
@@ -384,27 +454,15 @@
 		</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>
 			<to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_edit_mobile</from-outcome>
-			<to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>admin_delete_mobile</from-outcome>
-			<to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
-		</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>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>admin_show_mobile</from-outcome>
-			<to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
+			<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>
@@ -452,6 +510,67 @@
 			<to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/fax/admin_fax_delete.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_fax_provider</from-outcome>
+			<to-view-id>/admin/fax_provider/admin_fax_provider_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_fax</from-outcome>
+			<to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/landline/admin_landline_delete.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_landline_provider</from-outcome>
+			<to-view-id>/admin/landline_provider/admin_landline_provider_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_landline</from-outcome>
+			<to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/user/admin_user_resend_confirmation_link.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_user</from-outcome>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/mobile/admin_mobile_delete.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_mobile_provider</from-outcome>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_mobile</from-outcome>
+			<to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/fax/admin_fax_edit.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_fax</from-outcome>
+			<to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/landline/admin_landline_edit.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_landline</from-outcome>
+			<to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/mobile/admin_mobile_edit.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_mobile</from-outcome>
+			<to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/fax/admin_fax_show.xhtml</from-view-id>
 		<navigation-case>
@@ -464,7 +583,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>
@@ -483,7 +602,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>
@@ -506,7 +625,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>
@@ -536,25 +655,29 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</from-view-id>
+		<from-view-id>/admin/contact/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>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_show_mobile_provider</from-outcome>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/contact/admin_contact_list.xhtml</from-view-id>
@@ -584,6 +707,13 @@
 			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/user/admin_user_activity_log.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_user</from-outcome>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
 	<!--
 	<factory>
 		<exception-handler-factory>