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 5660bc07dae91b9c98676ae1141083b2faade378..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
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty mode}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <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>
@@ -19,7 +19,7 @@
                                        <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>
@@ -29,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>
@@ -43,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>
@@ -55,10 +55,10 @@
                                        </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>
@@ -73,9 +73,7 @@
 
                                <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_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />