From bb14720058eea45d45f2b1821377849ea6182e42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 5 Aug 2016 18:02:11 +0200 Subject: [PATCH] Continued: (please cherry-pick) - splitted lock/unlock user form MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/bundle_de_DE.properties | 6 +- .../localization/bundle_en_US.properties | 6 +- web/admin/user/admin_user_lock.xhtml | 90 +++++++++++++++++++ web/admin/user/admin_user_unlock.xhtml | 6 -- 4 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 web/admin/user/admin_user_lock.xhtml diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 698c888c..38a48a43 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -287,8 +287,8 @@ PAGE_TITLE_ADMIN_LIST_USER=Benutzeraccounts auflisten CONTENT_TITLE_ADMIN_LIST_USER=Auflisten von Benutzeraccounts: PAGE_TITLE_ADMIN_EDIT_USER=Benuzteraccount editieren CONTENT_TITLE_ADMIN_EDIT_USER=\u00c4ndern von Benutzeraccounts: -PAGE_TITLE_ADMIN_UNLOCK_USER=Ent-/Sperren von Benutzeraccounts -CONTENT_TITLE_ADMIN_UNLOCK_USER=Ent-/Sperren von Benutzeraccounts: +PAGE_TITLE_ADMIN_UNLOCK_USER=Entsperren von Benutzeraccounts +CONTENT_TITLE_ADMIN_UNLOCK_USER=Entsperren von Benutzeraccounts: ADMIN_MENU_USER_TITLE=Benutzerverwaltung PAGE_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen CONTENT_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen: @@ -628,3 +628,5 @@ ADMIN_UNLOCK_USER_TITLE=Benutzeraccount {0} ({1}) BUTTON_ADMIN_LOCK_USER_ACCOUNT=Benutzeraccount sperren BUTTON_ADMIN_UNLOCK_USER_ACCOUNT=Benutzeraccount entsperren ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Unbest\u00e4tigte Benutzeraccounts k\u00f6nnen nicht gesperrt werden. +PAGE_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren +CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index cfed18c3..6d95931b 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -270,8 +270,8 @@ PAGE_TITLE_ADMIN_LIST_USER=List user accounts CONTENT_TITLE_ADMIN_LIST_USER=List user accounts: PAGE_TITLE_ADMIN_EDIT_USER=Edit user accounts CONTENT_TITLE_ADMIN_EDIT_USER=Edit user accounts: -PAGE_TITLE_ADMIN_UNLOCK_USER=Un-/Lock user accounts -CONTENT_TITLE_ADMIN_UNLOCK_USER=Un-/Lock user accounts: +PAGE_TITLE_ADMIN_UNLOCK_USER=Unlock user accounts +CONTENT_TITLE_ADMIN_UNLOCK_USER=Unlock user accounts: ADMIN_MENU_USER_TITLE=User management PAGE_TITLE_ADMIN_ADD_USER=Add new user account CONTENT_TITLE_ADMIN_ADD_USER=Add new user account: @@ -625,3 +625,5 @@ ADMIN_UNLOCK_USER_TITLE=User account {0} ({1}) BUTTON_ADMIN_LOCK_USER_ACCOUNT=Lock user account BUTTON_ADMIN_UNLOCK_USER_ACCOUNT=Unlock user account ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Unconfirmed user accounts cannot be locked. +PAGE_TITLE_ADMIN_LOCK_USER=Lock user account +CONTENT_TITLE_ADMIN_LOCK_USER=Lock user account: diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml new file mode 100644 index 00000000..f08c7d82 --- /dev/null +++ b/web/admin/user/admin_user_lock.xhtml @@ -0,0 +1,90 @@ + + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_LOCK_USER} + + + #{msg.CONTENT_TITLE_ADMIN_LOCK_USER} + + + + + + +
+
+ + + + +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + + +
+
+ +
+ + + + + + + +
+
+ + + + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index ef48f6b1..8c9e71f0 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -67,8 +67,6 @@
- - @@ -78,10 +76,6 @@
- - - - -- 2.39.5