X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_unlock.xhtml;h=cd4978df6805a5691c085177bde333409cc9d8af;hb=8804ce096028f160185edb4ed56b08026b571ba7;hp=2c84aa3787a55734737ddefbaa1454a55d1884f0;hpb=f26c523a45a35b0d55fa268af8ed69cacc9f53a6;p=pizzaservice-war.git

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 2c84aa37..cd4978df 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -1,91 +1,118 @@
-<!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_UNLOCK_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLOCK_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_big">
-					<div class="table_header">
-						<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
-							<f:param value="#{beanHelper.user.userName}" />
-							<f:param value="#{beanHelper.user.userId}" />
-						</h:outputFormat>
-					</div>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="admin_title">
+		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+
+		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
+			<h:panelGroup styleClass="table_medium" layout="block">
+				<div class="table_header">
+					<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
+						<f:param value="#{beanHelper.user.userName}" />
+						<f:param value="#{beanHelper.user.userId}" />
+					</h:outputFormat>
+				</div>
 
-					<div class="table_row">
-						<div class="table_left25">
-							<h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
-						</div>
+				<div class="para">
+					<div class="table_data_label">
+						<h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
+					</div>
 
-						<div class="table_right75">
-							<h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
-						</div>
+					<div class="table_data_field">
+						<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+							<f:param name="userId" value="#{beanHelper.user.userId}" />
+						</h:link>
 					</div>
+				</div>
 
-					<div class="table_row">
-						<div class="table_left25">
-							<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
-						</div>
+				<div class="para">
+					<div class="table_data_label">
+						<h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
+					</div>
 
-						<div class="table_right75">
-							<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
-						</div>
+					<div class="table_data_field">
+						<h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
 					</div>
+				</div>
 
-					<div class="table_row">
-						<div class="table_left25">
-							<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
-						</div>
+				<div class="para">
+					<div class="table_data_label">
+						<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+					</div>
 
-						<div class="table_right75">
-							<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
-						</div>
+					<div class="table_data_field">
+						<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
 					</div>
+				</div>
 
-					<div class="table_row">
-						<div class="table_left25">
-							<h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
-						</div>
+				<div class="para">
+					<div class="table_data_label">
+						<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+					</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 class="table_data_field">
+						<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
+					</div>
+				</div>
 
-							<h:outputText value="#{adminUserController.userLockReason}" />
+				<div class="para">
+					<div class="table_data_label">
+						<h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+					</div>
 
-							<h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.UNCONFIRMED}" />
-						</div>
+					<div class="table_data_field">
+						<h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
+							<f:convertDateTime for="userLastLocked" type="both" />
+						</h:outputText>
 					</div>
+				</div>
 
-					<div class="table_footer">
-						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="para">
+					<div class="table_data_label">
+						<h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+					</div>
 
-						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.CONFIRMED}" />
+					<div class="table_data_field">
+						<h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
+					</div>
+				</div>
 
-						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.LOCKED}" />
+				<div class="table_footer">
+					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-						<h:outputText value="#{msg.ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == UserAccountStatus.UNCONFIRMED}" />
-					</div>
+					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
 				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+			</h:panelGroup>
+		</h:form>
+
+		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+			<f:param value="#{beanHelper.user.userName}" />
+			<f:param value="#{beanHelper.user.userId}" />
+		</h:outputFormat>
+
+		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+			<f:param value="#{beanHelper.user.userName}" />
+			<f:param value="#{beanHelper.user.userId}" />
+		</h:outputFormat>
+	</ui:define>
+</ui:composition>
