Please cherry-pick:

- reformatted f:selectItem tag for having each attribute in a single line

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl
index 8d2bc03ab991a377fa4ee09eb9080424625e8d27..def45ad09d7a0523b4eca861b1ace7b7e96e2926 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_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 0c154ca3c709da8df4d228a90aec72190a3c0982..cedefd2eccb371506d4098ee43a360f874f379b6 100644 (file)
--- 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 30803f12bf2c32d37854806e8fd9c2a312f77942..7d131fa6bed3a3eac5cc301388b03bde88c9a3c1 100644 (file)
--- 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 2e16c29d3d8c6e3720e7a0cdea5d42a897dc7665..45efc8a7fcadec3f8e9e54c8babf3b2c37dda487 100644 (file)
--- 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 15bf65eb311e0d361a9f7ea60d90e6ac4877dd64..af7eb067ec91b47862f81f57cb9b0fb1a0171f24 100644 (file)
--- 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 9d9dede6f1cec3863d593ceabffc0ff43c1fae08..21644cf79565b79d861aac9d04c048d37b83efff 100644 (file)
--- 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 2b55ab4952baf94250f684f2b5286b76dd201a29..c44235e5dc06626971277d4ef8f8d3a56b0c83ab 100644 (file)
--- 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 3b54506d15141404cfb53aad4858f7befbda9e01..61ddb0b1db7ea68ccea548fc0e4bdd4d8d05ce24 100644 (file)
--- 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 722fe3ba7edf28bf07c7b55e840ad67620591eb4..651763e377dee8e612832fd0b73a000d33b34597 100644 (file)
--- 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 9e57a99ac462eabb5ed96f488d26972904876bc9..611d39d60e2b8364331278908c22cc5ae262b83a 100644 (file)
--- 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 e6f5114cbc19d8c545847865db0d99c8c9659692..441db7d3aee561c8cbc7665b2a8b7965ac704095 100644 (file)
--- 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}"