Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / user / admin_form_user_data.tpl

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index ae979a96222ae79c7b42ac0bdd8f4adfb815317c..e91047b4f5750b39e53e07c9f3c4a9e217ed85b9 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -5,16 +5,21 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
+       <ui:fragment rendered="#{empty mode}">
+               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
 
        <ui:fragment rendered="#{not empty mode}">
                <div class="para">
-                       <fieldset id="login_data">
+                       <fieldset class="fieldset" id="login_data">
                                <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
                                        <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
                                </legend>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left_medium">
                                                <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                        </div>
@@ -24,11 +29,11 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
                                <div class="para"></div>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left_medium">
                                                <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
                                        </div>
@@ -38,9 +43,9 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left_medium">
                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
                                        </div>
@@ -50,16 +55,16 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
                                                </div>
 
                                                <div class="table_right_medium">
-                                                       <h:selectBooleanCheckbox styleClass="input" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
+                                                       <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -68,12 +73,10 @@
 
                                <div class="para notice">
                                        <ul>
-                                               <li>
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" />
-                                               </li>
+                                               <li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
 
                                                <li>
-                                                       <h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
                                                        <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
                                                </li>