From bafcd986c393d2dbed5ce0ff38af513f6e99b0ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 5 Aug 2016 17:03:13 +0200
Subject: [PATCH] Continued a bit: (please cherry-pick) - swapped userName <->
 userId - use table_big better, looked really messy before - added missing
 i18n strings (un-/locking user)

---
 src/java/org/mxchange/localization/bundle_de_DE.properties | 2 ++
 src/java/org/mxchange/localization/bundle_en_US.properties | 2 ++
 web/admin/user/admin_user_unlock.xhtml                     | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 0f324bf2..a9217138 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -590,3 +590,5 @@ USER_NEW_PASSWORD_REPEAT_REQUIRED=Bitte wiederholen Sie das neue Passwort. Dies
 ADMIN_USER_MUST_CHANGE_PASSWORD=Soll der Benutzer sein Kennwort nach dem Einloggen selber \u00e4ndern?
 ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht sperren oder entsperren, da es noch nicht best\u00e4tigt ist.
 ADMIN_USER_UNLOCK_REASON_REQUIRED=Bitte geben Sie einen aussagekr\u00e4ftigen Grund f\u00fcr die Account-Sperre ein.
+ADMIN_ENTER_USER_LOCK_REASON=Sperrgrund eingeben:
+ADMIN_UNLOCK_USER_TITLE=Benutzeraccount {0} ({1})
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 60892224..c328d6af 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -590,3 +590,5 @@ USER_NEW_PASSWORD_REPEAT_REQUIRED=Please repeat your new password. This is for p
 ADMIN_USER_MUST_CHANGE_PASSWORD=Should the user change his password after login?
 ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot lock or unlock user account, it is still unconfirmed.
 ADMIN_USER_UNLOCK_REASON_REQUIRED=Please provide a good reason why you want to lock this user's account.
+ADMIN_ENTER_USER_LOCK_REASON=Enter lock reason:
+ADMIN_UNLOCK_USER_TITLE=User account {0} ({1})
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 19ec057c..2c84aa37 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -23,11 +23,11 @@
 			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
 			<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user}">
-				<div class="table">
+				<div class="table_big">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
-							<f:param value="#{beanHelper.user.userId}" />
 							<f:param value="#{beanHelper.user.userName}" />
+							<f:param value="#{beanHelper.user.userId}" />
 						</h:outputFormat>
 					</div>
 
-- 
2.39.5