Continued a bit: (please cherry-pick)

- swapped userName <-> userId
- use table_big better, looked really messy before
- added missing i18n strings (un-/locking user)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 195e50b6f6d1a90886bcf58560ded3c24e8ff09f..12bd09a0e494184f4002f0b073e2d06bd9458c7f 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -623,3 +623,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 9f6eb8ee4af932c2b14a0678ecbdb8761f175dc9..c52251ffdcdb0a2d5523502510deca00eb2c5dc6 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -620,3 +620,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 19ec057cd5a3ce69a1a42190403e31610eabc2d3..2c84aa3787a55734737ddefbaa1454a55d1884f0 100644 (file)
--- 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>