Please cherry-pick:

- added i18n string for Switzerland
- added dynamic="true" when a very long list is expected

diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index 47a68927fa229a52a1a51ba9e436b46db2a2de59..32ff82263c0282381a49d93b5d50b0b4a9464663 100644 (file)
--- a/src/java/org/mxchange/localization/generic_de_DE.properties
+++ b/src/java/org/mxchange/localization/generic_de_DE.properties
@@ -139,6 +139,7 @@ COUNTRY_NETHERLANDS=Niederlande
 COUNTRY_PHILIPPINES=Philippinen
 COUNTRY_POLAND=Polen
 COUNTRY_SWEDEN=Schweden
+COUNTRY_SWITZERLAND=Schweiz
 COUNTRY_TURKEY=T\u00fcrkei
 COUNTRY_THAILAND=Thailand
 COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.

diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties
index 55a974ff0026d0840e7e10bf2e68cf609019898c..4f57c2c80693ea5fa4db6d2428e3f4b04652e424 100644 (file)
--- a/src/java/org/mxchange/localization/generic_en_US.properties
+++ b/src/java/org/mxchange/localization/generic_en_US.properties
@@ -139,6 +139,7 @@ COUNTRY_NETHERLANDS=Netherlands
 COUNTRY_PHILIPPINES=Philippines
 COUNTRY_POLAND=Poland
 COUNTRY_SWEDEN=Sweden
+COUNTRY_SWITZERLAND=Switzerland
 COUNTRY_THAILAND=Thailand
 COUNTRY_TURKEY=Turkey
 COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.

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 cedefd2eccb371506d4098ee43a360f874f379b6..51b27a782f319c7efa47436de7d7a2b5d05ab92e 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
@@ -9,7 +9,6 @@
        <p:selectOneMenu
                id="#{id}"
                value="#{value}"
-               styleClass="#{empty styleClass ? 'select' : styleClass}"
                filter="true"
                filterMatchMode="contains"
                rendered="#{empty rendered or rendered}"

diff --git a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
index 45efc8a7fcadec3f8e9e54c8babf3b2c37dda487..6f2d5d2c479d798c9aaf780d33a1d593c7a2e470 100644 (file)
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
@@ -24,6 +24,7 @@
                                value="#{adminBranchOfficeActionController.branchCompany}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                required="true"
                                requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
                                >
@@ -46,6 +47,7 @@
                                value="#{adminBranchOfficeActionController.branchContactEmployee}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -69,6 +71,7 @@
                                value="#{adminBranchOfficeActionController.branchOwnerEmployee}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -92,6 +95,7 @@
                                value="#{adminBranchOfficeActionController.branchUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />

diff --git a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
index 4af4b8665bfb8c3f6f308e0674c600c7887ea1c2..eed88037823bf5bed673f8bffece851d793c64c8 100644 (file)
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
@@ -52,7 +52,12 @@
 
                                <f:converter converterId="DayOfTheWeekConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.PLEASE_SELECT}"
+                                       noSelectionOption="true"
+                                       itemDisabled="true"
+                                       />
 
                                <f:selectItems
                                        value="#{dataController.dayOfTheWeek}"

diff --git a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
index af7eb067ec91b47862f81f57cb9b0fb1a0171f24..42ecb867535b1f98d89ab1165af1a9e812faea35 100644 (file)
--- a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
@@ -31,6 +31,7 @@
                                value="#{adminDepartmentActionController.departmentCompany}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                required="true"
                                requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
                                >
@@ -53,6 +54,7 @@
                                value="#{adminDepartmentActionController.departmentBranchOffice}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="BranchOfficeConverter" />
@@ -76,6 +78,7 @@
                                value="#{adminDepartmentActionController.departmentHeadquarter}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="HeadquarterConverter" />
@@ -99,6 +102,7 @@
                                value="#{adminDepartmentActionController.departmentLead}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -122,6 +126,7 @@
                                value="#{adminDepartmentActionController.departmentUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />

diff --git a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
index 21644cf79565b79d861aac9d04c048d37b83efff..8ebf92ef4b32782cf31b943ef0f2e1325d024654 100644 (file)
--- a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
@@ -24,6 +24,7 @@
                                value="#{adminEmployeeController.employeeBasicData}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                required="true"
                                requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
                                >
@@ -51,6 +52,7 @@
                                value="#{adminEmployeeController.employeeBranchOffice}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="BranchOfficeConverter" />
@@ -74,6 +76,7 @@
                                value="#{adminEmployeeController.employeePersonalData}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -97,6 +100,7 @@
                                value="#{adminEmployeeController.employeeUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />
@@ -149,6 +153,7 @@
                                value="#{adminEmployeeController.employeeDepartment}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="DepartmentConverter" />
@@ -172,6 +177,7 @@
                                value="#{adminEmployeeController.employeeHeadquarter}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="HeadquarterConverter" />

diff --git a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
index 61ddb0b1db7ea68ccea548fc0e4bdd4d8d05ce24..9792388767b54ddb78a0c2870f23064275a19d8d 100644 (file)
--- a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
+++ b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
@@ -37,6 +37,7 @@
                                value="#{adminHeadquarterActionController.headquarterContactEmployee}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -60,6 +61,7 @@
                                value="#{adminHeadquarterActionController.headquarterUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />

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 c44235e5dc06626971277d4ef8f8d3a56b0c83ab..fd30eb7d3eb3087cf6b266928717f56ba082477d 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
@@ -31,7 +31,10 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select" id=" " value="#{adminPhoneController.faxNumber}">
+                                       <p:selectOneMenu
+                                               id="faxNumber"
+                                               value="#{adminPhoneController.faxNumber}"
+                                               >
                                                <f:converter converterId="FaxNumberConverter" />
 
                                                <f:selectItem

diff --git a/web/admin/business/basic_data/admin_basic_data_list.xhtml b/web/admin/business/basic_data/admin_basic_data_list.xhtml
index 441db7d3aee561c8cbc7665b2a8b7965ac704095..3373ea2d9a29529b8360c8c0b6a9004f1fd53228 100644 (file)
--- a/web/admin/business/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/business/basic_data/admin_basic_data_list.xhtml
@@ -147,6 +147,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('basicDataList').filter()"
                                                        updateLabel="true"
@@ -192,6 +193,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('basicDataList').filter()"
                                                        updateLabel="true"
@@ -237,6 +239,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('basicDataList').filter()"
                                                        updateLabel="true"
@@ -492,9 +495,9 @@
                                                        <p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_USER_OWNER}" />
                                                        <p:selectOneMenu
                                                                id="companyUserOwner"
-                                                               value="#{adminBasicCompanyDataController.companyUserOwner}"
                                                                filter="true"
                                                                filterMatchMode="contains"
+                                                               value="#{adminBasicCompanyDataController.companyUserOwner}"
                                                                >
 
                                                                <f:converter converterId="UserConverter" />
@@ -515,9 +518,9 @@
                                                        <p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE}" />
                                                        <p:selectOneMenu
                                                                id="companyContactEmployee"
-                                                               value="#{adminBasicCompanyDataController.companyContactEmployee}"
                                                                filter="true"
                                                                filterMatchMode="contains"
+                                                               value="#{adminBasicCompanyDataController.companyContactEmployee}"
                                                                >
 
                                                                <f:converter converterId="EmployeeConverter" />
@@ -538,9 +541,9 @@
                                                        <p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_FOUNDER}" />
                                                        <p:selectOneMenu
                                                                id="companyFounder"
-                                                               value="#{adminBasicCompanyDataController.companyFounder}"
                                                                filter="true"
                                                                filterMatchMode="contains"
+                                                               value="#{adminBasicCompanyDataController.companyFounder}"
                                                                >
 
                                                                <f:converter converterId="EmployeeConverter" />

diff --git a/web/admin/business/branch_office/admin_branch_office_list.xhtml b/web/admin/business/branch_office/admin_branch_office_list.xhtml
index c28d1e6cf8305715849c92c45c8bd341aa6becc1..2cea97506de25eb5d708c184c42437933b1f01da 100644 (file)
--- a/web/admin/business/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/business/branch_office/admin_branch_office_list.xhtml
@@ -122,6 +122,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('branchOfficeList').filter()"
                                                        updateLabel="true"
@@ -157,6 +158,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('branchOfficeList').filter()"
                                                        updateLabel="true"
@@ -228,6 +230,7 @@
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
+                                                       dynamic="true"
                                                        filterMatchMode="contains"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('branchOfficeList').filter()"

diff --git a/web/admin/business/department/admin_department_list.xhtml b/web/admin/business/department/admin_department_list.xhtml
index 036da9cc51752f3ddd4d9ef31f9836785633e351..52aff8a4af5be6b10d82d5eff472427796b769e5 100644 (file)
--- a/web/admin/business/department/admin_department_list.xhtml
+++ b/web/admin/business/department/admin_department_list.xhtml
@@ -120,6 +120,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
@@ -155,6 +156,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_BRANCH_OFFICES}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
@@ -200,6 +202,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
@@ -245,6 +248,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"

diff --git a/web/admin/business/employee/admin_employee_list.xhtml b/web/admin/business/employee/admin_employee_list.xhtml
index c6e460c50a38102a89612318da6b9a00a7ef01c6..63d223bda1d36e860b9c29a93026ad0ebcbf37f0 100644 (file)
--- a/web/admin/business/employee/admin_employee_list.xhtml
+++ b/web/admin/business/employee/admin_employee_list.xhtml
@@ -121,6 +121,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_BRANCH_OFFICES}"
                                                        onchange="PF('employeeList').filter()"
                                                        updateLabel="true"
@@ -166,6 +167,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('employeeList').filter()"
                                                        updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
@@ -210,6 +212,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('employeeList').filter()"
                                                        updateLabel="true"

diff --git a/web/admin/business/headquarter/admin_headquarter_list.xhtml b/web/admin/business/headquarter/admin_headquarter_list.xhtml
index 9bc2aa46ccffec22d3ea960a8d53ef1896cac83c..41d2b242cb6e9d4c3de3ecded581097e810214d8 100644 (file)
--- a/web/admin/business/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/business/headquarter/admin_headquarter_list.xhtml
@@ -111,6 +111,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('headquarterList').filter()"
                                                        updateLabel="true"
@@ -180,6 +181,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('headquarterList').filter()"
                                                        updateLabel="true"

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index dd3b0b1691463dc0be7fd01164308c427bf22c1d..bb348e45bfb201a36069493102e045cc52bae6f0 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -130,6 +130,7 @@
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COUNTRIES}"
                                                        onchange="PF('mobileProviderList').filter()"
                                                        updateLabel="true"

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index b807d4576824b6542761cdc71cb408789767848a..e6e3a9a4a3cfe0591ae66c590f9b5f645b4acd3a 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -318,9 +318,10 @@
                                                <p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
                                                <p:selectOneMenu
                                                        id="userContact"
-                                                       value="#{adminUserController.contact}"
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       value="#{adminUserController.contact}"
+                                                       title="#{msg.FILTER_BY_SINGLE_CONTACT_TITLE}"
                                                        >
                                                        <f:converter converterId="ContactConverter" />