From: Roland Häder Date: Sat, 24 Nov 2018 16:22:01 +0000 (+0100) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e4fda4af8ad62d9233b70e812d17fb8232273769;p=jfinancials-war.git Please cherry-pick: - splitted f:selectItems' attributes into multiple lines having in each a separate attribute for easy adding Signed-off-by: Roland Häder --- 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 14c66d21..5cefcbfd 100644 --- 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 @@ -36,8 +36,15 @@ requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}" > + - + + diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl index 622f045d..c551f289 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl @@ -37,8 +37,15 @@ filter="true" filterMatchMode="contains" > + - + + 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 37dd1926..b3369930 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 @@ -17,7 +17,14 @@ requiredMessage="#{requiredMessage}" > + - + + diff --git a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl index b8a30535..8731f8cc 100644 --- a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl +++ b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl @@ -13,6 +13,12 @@ requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}" rendered="#{empty rendered or rendered == true}" > - + + diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl index 4284af9f..7f6432bc 100644 --- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl @@ -15,8 +15,15 @@ filter="true" filterMatchMode="contains" > + - + + diff --git a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl index 889bd7fc..33e90389 100644 --- a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl +++ b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl @@ -72,9 +72,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -84,9 +92,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -96,9 +112,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -108,9 +132,17 @@ filter="true" filterMatchMode="contains" > + + - + + 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 08744712..90a88a8d 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 @@ -27,9 +27,17 @@ required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}" > + + - + + @@ -39,9 +47,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -51,9 +67,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -63,9 +87,17 @@ filter="true" filterMatchMode="contains" > + + - + + diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl index a88861b0..6c54ce6c 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl @@ -28,9 +28,17 @@ required="true" requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}" > + + - + + + + - + + + + - + + @@ -47,8 +55,15 @@ filterMatchMode="contains" > + - + + @@ -58,9 +73,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -70,9 +93,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -82,9 +113,17 @@ filter="true" filterMatchMode="contains" > + + - + + 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 4440c7ad..be6680b6 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 @@ -27,9 +27,17 @@ required="true" requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}" > + + - + + @@ -39,9 +47,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -51,9 +67,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -63,9 +87,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -104,9 +136,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -116,9 +156,17 @@ filter="true" filterMatchMode="contains" > + + - + + 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 4ae25536..d96d9eb3 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 @@ -28,8 +28,15 @@
+ - + +
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 53ab8ec2..f6e14c7c 100644 --- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl +++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl @@ -38,9 +38,17 @@ filter="true" filterMatchMode="contains" > + + - + + @@ -50,9 +58,17 @@ filter="true" filterMatchMode="contains" > + + - + + diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl index 2c688e8b..20479554 100644 --- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl +++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl @@ -29,9 +29,17 @@ required="true" requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}" > + + - + + + + - + + + - + + 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 a473efa4..19cf2805 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 @@ -28,8 +28,15 @@
+ - + +
diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl index 02187981..767ee3e0 100644 --- a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl +++ b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl @@ -29,9 +29,17 @@ required="true" requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}" > + + - + + + + - + + + - + + diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml index 3908532f..34cd3dec 100644 --- a/web/admin/basic_data/admin_basic_data_list.xhtml +++ b/web/admin/basic_data/admin_basic_data_list.xhtml @@ -104,7 +104,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + @@ -128,7 +134,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + @@ -152,7 +164,13 @@ title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}" > - + + diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index a6711824..4d0377ff 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -102,7 +102,13 @@ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}" > - + + @@ -122,7 +128,13 @@ title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}" > - + + @@ -156,7 +168,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml index 03d8d46c..642e09b2 100644 --- a/web/admin/department/admin_department_list.xhtml +++ b/web/admin/department/admin_department_list.xhtml @@ -74,7 +74,13 @@ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}" > - + + @@ -94,7 +100,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + @@ -118,7 +130,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + @@ -142,7 +160,13 @@ title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}" > - + + diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml index 0f84b63c..50bdb39a 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/employee/admin_employee_list.xhtml @@ -75,7 +75,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + @@ -98,7 +104,13 @@ updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}" > - + + @@ -122,7 +134,13 @@ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}" > - + + diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml index b728eb55..c8ec3456 100644 --- a/web/admin/headquarter/admin_headquarter_list.xhtml +++ b/web/admin/headquarter/admin_headquarter_list.xhtml @@ -70,7 +70,13 @@ title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}" > - + + @@ -104,7 +110,13 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + + diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml index a7128e1d..055c4ee7 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/opening_time/admin_opening_time_list.xhtml @@ -68,7 +68,13 @@ title="#{msg.FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE}" > - + + @@ -84,7 +90,13 @@ title="#{msg.FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE}" > - + + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index d4652d6d..f5a1b057 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -176,7 +176,13 @@ filterMatchMode="contains" > - + +