From: Roland Häder Date: Fri, 5 Aug 2016 16:02:11 +0000 (+0200) Subject: Continued: (please cherry-pick) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0b070e939d9e8013e7b3597cd76b609215c54af8;p=pizzaservice-war.git Continued: (please cherry-pick) - splitted lock/unlock user form Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 2d9147f3..c8667ecb 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -220,9 +220,9 @@ 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: -ADMIN_MENU_USER_TITLE=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: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, alle Benutzer auflisten @@ -600,3 +600,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 a66010d5..3a8926b3 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -187,9 +187,9 @@ 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: -ADMIN_MENU_USER_TITLE=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: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users @@ -583,3 +583,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 @@
- - - -