From 3ddd24b8bd99552e9a134e94a2eadc2677a17da2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 15 Aug 2016 15:07:47 +0200
Subject: [PATCH] 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

---
 .../admin/user/admin_form_user_personal_data.tpl     |  4 ----
 web/admin/user/admin_user_list.xhtml                 | 12 ++++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

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 b6a1bd1d..67d67310 100644
--- 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 f65c99cc..6d03cc0d 100644
--- 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}" />
-- 
2.39.2