From 5b2d7b375a26cb535cb1ef79794740798931c000 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 10 Jun 2020 19:03:04 +0200
Subject: [PATCH] Please cherry-pick: - reformatted f:selectItem tag for having
 each attribute in a single line
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../mobile/admin_form_mobile_data.tpl         |  5 +++-
 .../form_data/form_country_selector.tpl       |  6 ++++-
 .../panel_grid/mobile_input_panel_grid.tpl    | 14 +++++++++--
 .../admin_form_branch_office_data.tpl         | 15 ++++++++---
 .../department/admin_form_department_data.tpl | 21 +++++++++++++---
 .../employee/admin_form_employee_data.tpl     | 25 +++++++++++++++----
 .../admin/fax/admin_form_add_contact_fax.tpl  |  7 ++++--
 .../headquarter/admin_form_headquarter.tpl    | 10 ++++++--
 .../admin_form_add_contact_landline.tpl       |  5 +++-
 .../mobile/admin_form_add_contact_mobile.tpl  | 10 ++++++--
 .../basic_data/admin_basic_data_list.xhtml    | 20 ++++++++++++---
 11 files changed, 111 insertions(+), 27 deletions(-)

diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
index 265dad9f..a12e8c09 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
@@ -37,7 +37,10 @@
 					>
 					<f:converter converterId="MobileProviderConverter" />
 
-					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItem
+						itemValue="#{null}"
+						itemLabel="#{msg.NONE_SELECTED}"
+						/>
 
 					<f:selectItems
 						value="#{mobileProviderListController.allMobileProviders}"
diff --git a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
index 0c154ca3..cedefd2e 100644
--- a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
+++ b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
@@ -18,7 +18,11 @@
 		>
 		<f:converter converterId="CountryConverter" />
 
-		<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" rendered="#{empty allowNull or allowNull}" />
+		<f:selectItem
+			itemValue="#{null}"
+			itemLabel="#{msg.NONE_SELECTED}"
+			rendered="#{empty allowNull or allowNull}"
+			/>
 
 		<f:selectItems
 			value="#{countryListController.allCountries}"
diff --git a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
index d9280ede..1d940d50 100644
--- a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
+++ b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
@@ -6,15 +6,25 @@
 	xmlns:p="http://primefaces.org/ui"
 	>
 
-	<p:panelGrid layout="grid" columns="2" rendered="#{empty rendered or rendered == true}">
+	<p:panelGrid
+		layout="grid"
+		columns="2"
+		rendered="#{empty rendered or rendered == true}"
+		>
 		<p:selectOneMenu
 			id="mobileProvider"
 			value="#{targetController.mobileProvider}"
 			filter="true"
 			filterMatchMode="contains"
 			>
+
 			<f:converter converterId="MobileProviderConverter" />
-			<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+
+			<f:selectItem
+				itemValue="#{null}"
+				itemLabel="#{msg.NONE_SELECTED}"
+				/>
+
 			<f:selectItems
 				value="#{mobileProviderListController.allMobileProviders}"
 				var="mobileProvider"
diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
index 2e16c29d..45efc8a7 100644
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -50,7 +50,10 @@
 
 				<f:converter converterId="ContactConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{contactListController.allContacts}"
@@ -70,7 +73,10 @@
 
 				<f:converter converterId="ContactConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{contactListController.allContacts}"
@@ -90,7 +96,10 @@
 
 				<f:converter converterId="UserConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{userListController.allUsers}"
diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
index 15bf65eb..af7eb067 100644
--- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
@@ -54,9 +54,13 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="BranchOfficeConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{branchOfficeListController.allBranchOffices}"
@@ -76,7 +80,10 @@
 
 				<f:converter converterId="HeadquarterConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{headquarterListController.allHeadquarters}"
@@ -96,7 +103,10 @@
 
 				<f:converter converterId="ContactConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{contactListController.allContacts}"
@@ -116,7 +126,10 @@
 
 				<f:converter converterId="UserConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{userListController.allUsers}"
diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
index 9d9dede6..21644cf7 100644
--- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
@@ -55,7 +55,10 @@
 
 				<f:converter converterId="BranchOfficeConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{branchOfficeListController.allBranchOffices}"
@@ -75,7 +78,10 @@
 
 				<f:converter converterId="ContactConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{contactListController.allContacts}"
@@ -95,7 +101,10 @@
 
 				<f:converter converterId="UserConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{userListController.allUsers}"
@@ -144,7 +153,10 @@
 
 				<f:converter converterId="DepartmentConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{departmentListController.allDepartments}"
@@ -164,7 +176,10 @@
 
 				<f:converter converterId="HeadquarterConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{headquarterListController.allHeadquarters}"
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index 2b55ab49..c44235e5 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -34,13 +34,16 @@
 					<p:selectOneMenu styleClass="select" id=" " value="#{adminPhoneController.faxNumber}">
 						<f:converter converterId="FaxNumberConverter" />
 
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem
+							itemValue="#{null}"
+							itemLabel="#{msg.NONE_SELECTED}"
+							/>
 
 						<f:selectItems
 							value="#{adminPhoneController.allNonLinkedFaxNumbers}"
 							var="faxNumber"
 							itemValue="#{faxNumber}"
-							itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}"
+							itemLabel="#{beanHelper.renderPhoneNumber(faxNumber)}"
 							/>
 					</p:selectOneMenu>
 				</div>
diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
index 3b54506d..61ddb0b1 100644
--- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
+++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
@@ -41,7 +41,10 @@
 
 				<f:converter converterId="ContactConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{contactListController.allContacts}"
@@ -61,7 +64,10 @@
 
 				<f:converter converterId="UserConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
 
 				<f:selectItems
 					value="#{userListController.allUsers}"
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 722fe3ba..651763e3 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -37,7 +37,10 @@
 					>
 					<f:converter converterId="LandLineNumberConverter" />
 
-					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItem
+						itemValue="#{null}"
+						itemLabel="#{msg.NONE_SELECTED}"
+						/>
 
 					<f:selectItems
 						value="#{adminPhoneController.allNonLinkedLandLineNumbers}"
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index 9e57a99a..611d39d6 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -30,10 +30,16 @@
 				columns="2"
 				>
 				<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
-				<p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminMobileController.mobileNumber}">
+				<p:selectOneMenu
+					id="mobileNumber"
+					value="#{adminMobileController.mobileNumber}">
+
 					<f:converter converterId="MobileNumberConverter" />
 
-					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItem
+						itemValue="#{null}"
+						itemLabel="#{msg.NONE_SELECTED}"
+						/>
 
 					<f:selectItems
 						value="#{adminMobileController.allNonLinkedMobileNumbers}"
diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index e6f5114c..441db7d3 100644
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -499,7 +499,10 @@
 
 								<f:converter converterId="UserConverter" />
 
-								<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+								<f:selectItem
+									itemValue="#{null}"
+									itemLabel="#{msg.NONE_SELECTED}"
+									/>
 
 								<f:selectItems
 									value="#{userListController.allUsers}"
@@ -519,7 +522,10 @@
 
 								<f:converter converterId="EmployeeConverter" />
 
-								<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+								<f:selectItem
+									itemValue="#{null}"
+									itemLabel="#{msg.NONE_SELECTED}"
+									/>
 
 								<f:selectItems
 									value="#{employeeListController.allEmployees}"
@@ -539,7 +545,10 @@
 
 								<f:converter converterId="EmployeeConverter" />
 
-								<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+								<f:selectItem
+									itemValue="#{null}"
+									itemLabel="#{msg.NONE_SELECTED}"
+									/>
 
 								<f:selectItems
 									value="#{employeeListController.allEmployees}"
@@ -559,7 +568,10 @@
 
 								<f:converter converterId="HeadquarterConverter" />
 
-								<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+								<f:selectItem
+									itemValue="#{null}"
+									itemLabel="#{msg.NONE_SELECTED}"
+									/>
 
 								<f:selectItems
 									value="#{headquarterListController.allHeadquarters}"
-- 
2.39.5