From a54742d9f0e773b5436833e6105477542ee0ffb7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 5 Aug 2016 17:42:16 +0200
Subject: [PATCH] Continued with cleanup: (please cherry-pick) - enumerations
 cannot be compared in JSF until JSF 3.0, so compare only the string, thanks
 to BalusC@stackoverflow - a lot CSS cleanups, such as correct padding and
 sizes - replaced table_row -> para - removed table_left/right_25/75 (was not
 working somewhy correctly)

---
 web/admin/user/admin_user_unlock.xhtml | 52 ++++++++++++--------------
 web/resources/css/cssLayout.css        |  5 ++-
 web/resources/css/default.css          |  2 +-
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 4a369191..f9ed10ad 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -23,7 +23,7 @@
 			<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_big">
+				<div class="table_medium">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
 							<f:param value="#{beanHelper.user.userName}" />
@@ -31,68 +31,62 @@
 						</h:outputFormat>
 					</div>
 
-					<div class="table_row">
-						<div class="table_left25">
+					<div class="para">
+						<div>
 							<h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
 						</div>
 
-						<div class="table_right75">
+						<div>
 							<h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
 						</div>
-
-						<div class="clear"></div>
 					</div>
 
-					<div class="table_row">
-						<div class="table_left25">
+					<div class="para">
+						<div>
 							<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 						</div>
 
-						<div class="table_right75">
+						<div>
 							<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
 						</div>
-
-						<div class="clear"></div>
 					</div>
 
-					<div class="table_row">
-						<div class="table_left25">
+					<div class="para">
+						<div>
 							<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 						</div>
 
-						<div class="table_right75">
+						<div>
 							<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
 						</div>
-
-						<div class="clear"></div>
 					</div>
 
-					<div class="table_row">
-						<div class="table_left25">
+					<div class="para">
+						<div>
 							<h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
 						</div>
 
-						<div class="table_right75">
-							<h:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="30" rows="20" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+						<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}" />
+							<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 == UserAccountStatus.UNCONFIRMED}" />
+							<h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
 						</div>
-
-						<div class="clear"></div>
 					</div>
 
 					<div class="table_footer">
 						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.CONFIRMED}" />
-
-						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.LOCKED}" />
+						<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 value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.UNCONFIRMED}" />
+						<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>
 
-						<div class="clear"></div>
+						<h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
 					</div>
 				</div>
 			</h:form>
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 01512149..cf19d773 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -44,7 +44,8 @@ div, table {
 }
 
 .left_content {
-	padding: 5px;
+	padding-right: 5px;
+	padding-bottom: 5px;
 	margin-left: 190px;
 }
 
@@ -70,7 +71,7 @@ table, .table, .table_medium {
 }
 
 .table_medium {
-	width: 700px;
+	width: 620px;
 }
 
 .table_big {
diff --git a/web/resources/css/default.css b/web/resources/css/default.css
index db4c73f3..2c2688d1 100644
--- a/web/resources/css/default.css
+++ b/web/resources/css/default.css
@@ -3,7 +3,7 @@ body {
 	font-size: 12px;
 	font-family: sans-serif;
 	color: #000000;
-	margin: 10px;
+	margin: 0px;
 }
 
 h1 {
-- 
2.39.5