Updated copyright year

[addressbook-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 03bfc251328d146b9a5b30fab0750b70a65c9856..a0f535f3efb504bb79a7d6c4bca106f6e8a9c543 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -1,20 +1,28 @@
 <?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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <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: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 action="#{beanHelper.notifyControllerUserConverted()}" />
                </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>
 
@@ -23,10 +31,8 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets: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 table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
@@ -70,7 +76,7 @@
                                        </div>
 
                                        <div class="table-right-medium">
-                                               <p:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+                                               <p:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                        </div>
                                </h:panelGroup>
 
@@ -91,12 +97,20 @@
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" 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="alert-danger" 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>