Continued with XHTML changes: (please cherry-pick)

- added div (at least id) for upcoming JavaScript (onselect) expansion
- if the admin chooses already but not linked contact data, disable contact form data
- if none is selected show form
- this required that an ui:inlude needs to be moved

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
index b6a1bd1d68dff5659390be385afe85f4f606f682..67d67310c865b1e77d0ba3c1f1764b781ac569ed 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
@@ -10,8 +10,4 @@
        </div>
 
        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
-
-       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-               <ui:param name="mode" value="add" />
-       </ui:include>
 </ui:composition>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index f65c99cc36c7c1329cb9db2b51e43964e7d260ec..6d03cc0d345d6886e568aac5214b4a2ca7bdad47 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -91,7 +91,8 @@
                                                <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                        </div>
 
-                                       <div class="para">
+                                       <!-- Whether select contact data .. //-->
+                                       <div id="admin_user_personal_data_option_1" class="para">
                                                <fieldset class="fieldset" id="user_contact">
                                                        <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
                                                                <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
@@ -118,7 +119,14 @@
                                                <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
                                        </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       <!-- ... or enter it directly together it creating user account //-->
+                                       <div id="admin_user_personal_data_option_2">
+                                               <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
+                                               <ui:param name="mode" value="add" />
+                                       </ui:include>
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />