Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_lock.xhtml

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index f49798322065ee745dbfa93c51023f04ca7e6c0b..2e20cc4e21edff67fc4980d45b6729f00f77f875 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -1,10 +1,11 @@
 <?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:core="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">
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="metadata">
                <f:metadata>
@@ -13,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
        </ui:define>
 
@@ -22,71 +23,71 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+               <h:form id="form-admin-user-lock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                       <h:panelGroup styleClass="table table-full" layout="block">
+                               <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="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
+                                               <p:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table-right-medium">
                                                <h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
-                                       <div>
-                                               <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
+                                               <p:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table-right-medium">
                                                <h:outputFormat id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
-                                       <div>
-                                               <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
+                                               <p:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table-right-medium">
                                                <h:outputFormat id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
-                                       <div>
-                                               <h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
+                                               <p:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
                                        </div>
 
-                                       <div>
-                                               <h:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+                                       <div class="table-right-medium">
+                                               <p:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-                                       <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
+                                       <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_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_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>