From 0b070e939d9e8013e7b3597cd76b609215c54af8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
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 <roland@mxchange.org>
---
 .../localization/bundle_de_DE.properties      |  8 +-
 .../localization/bundle_en_US.properties      |  8 +-
 web/admin/user/admin_user_lock.xhtml          | 90 +++++++++++++++++++
 web/admin/user/admin_user_unlock.xhtml        |  6 --
 4 files changed, 100 insertions(+), 12 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 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 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<f:metadata>
+		<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyUserToController()}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOCK_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_LOCK_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			<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_medium">
+					<div class="table_header">
+						<h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
+							<f:param value="#{beanHelper.user.userName}" />
+							<f:param value="#{beanHelper.user.userId}" />
+						</h:outputFormat>
+					</div>
+
+					<div class="para">
+						<div>
+							<h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
+						</div>
+
+						<div>
+							<h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+						</div>
+					</div>
+
+					<div class="para">
+						<div>
+							<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+						</div>
+
+						<div>
+							<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
+						</div>
+					</div>
+
+					<div class="para">
+						<div>
+							<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+						</div>
+
+						<div>
+							<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
+						</div>
+					</div>
+
+					<div class="para">
+						<div>
+							<h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
+						</div>
+
+						<div>
+							<h:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}" />
+
+							<h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
+						</div>
+					</div>
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+
+						<ui:fragment rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+							<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
+						</ui:fragment>
+
+						<h:outputText styleClass="errors" value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
+					</div>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
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 @@
 						</div>
 
 						<div>
-							<h:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}" />
-
 							<h:outputText value="#{adminUserController.userLockReason}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}" />
 
 							<h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
@@ -78,10 +76,6 @@
 					<div class="table_footer">
 						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-						<ui:fragment rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-							<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
-						</ui:fragment>
-
 						<ui:fragment rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
 							<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
 						</ui:fragment>
-- 
2.39.5

