Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / resources / tags / admin / form_data / user / admin_form_user_data.tpl

diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
index b9573ae63be0afc381e7f00ae6da40cb97a357a9..de66672fb03b5b47d0e8c49e4b081079de0448b6 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
@@ -4,63 +4,64 @@
        xmlns:widgets="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui">
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
-               <fieldset class="fieldset" id="login_data">
+               <fieldset class="fieldset">
                        <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
                        </legend>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+                                       <p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
+                                       <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="userName" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
+                                       <p:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                                       <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="userPassword" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
+                                       <p:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                                       <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="userPasswordRepeat" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+                                       <p:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
+                                       <p:selectBooleanCheckbox id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
                                </div>
                        </h:panelGroup>