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

Please cherry-pick:
- opps, missed navigation rules
- switched to table_medium
- added missing i18n string
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 090a1afa..09f78d14 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -775,3 +775,4 @@ BUTTON_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen
 ADMIN_DELETE_USER_NOTICE=Durch das L\u00f6schen des Benutzeraccounts werden nur die Benutzerdaten, jedoch nicht Kontaktdaten.
 ADMIN_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Benutzeraccount gel\u00f6scht vom Administrator.
 USER_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Ihr Benutzeraccount wurde von einem Administrator gel\u00f6scht.
+ADMIN_USER_DELETE_REASON=L\u00f6schgrund: (optional)
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 8b9f10c1..98308e24 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -776,3 +776,4 @@ BUTTON_ADMIN_DELETE_USER=Delete user account
 ADMIN_DELETE_USER_NOTICE=By deleting the user's account, only user data is deleted but not contact data.
 ADMIN_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=User account has been deleted by administrator.
 USER_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Your account has been deleted by an administrator.
+ADMIN_USER_DELETE_REASON=Delete reason: (optional)
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 982cd10c..3a0c0844 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -283,7 +283,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>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 6a2931c5..a63d488d 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -32,7 +32,7 @@
 			</ui:fragment>
 
 			<h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-				<h:panelGroup styleClass="table" layout="block">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
 							<f:param value="#{beanHelper.user.userName}" />