really no more cellphone ... :-/ Let's hope it.

[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 9682c043057944d9188dcc49a314aaaeff52745f..ec1edd8810ed3c785c963191e68f7358fcdc622c 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -15,14 +15,21 @@
        </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'}">
                                <h:panelGroup styleClass="table_medium" layout="block">
@@ -35,7 +42,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">
@@ -75,13 +82,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>