please copy a matching file from templates.dist and remove this dummy when you want...

[jjobs-war.git] / web / admin / user / admin_user_unlock.xhtml
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml

index 9583039570c0b028cdeb70f43fd7b1c20dce5183..d0cde138fc105d3d58d05ff711c296566f61826c 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
  <!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}"
@@ -7,23 +8,32 @@
         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:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
  
         <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="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
+                       <h:outputText value="#{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}" />
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
  
                         <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-                               <div class="table_medium">
+                               <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}" />
@@ -33,7 +43,7 @@
  
                                         <div class="para">
                                                 <div class="table_data_label">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
+                                                       <h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
                                                 </div>
  
                                                 <div class="table_data_field">
@@ -73,13 +83,25 @@
                                                 </div>
                                         </div>
  
+                                       <div class="para">
+                                               <div class="table_data_label">
+                                                       <h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+                                               </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="para">
                                                 <div class="table_data_label">
                                                         <h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
                                                 </div>
  
                                                 <div class="table_data_field">
-                                                       <h:outputText id="userLockReason" value="#{adminUserController.userLockReason}" />
+                                                       <h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
                                                 </div>
                                         </div>
  
@@ -88,7 +110,7 @@
  
                                                 <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
                                         </div>
-                               </div>
+                               </h:panelGroup>
                         </h:form>
  
                         <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">