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/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 331ddb6888ea87f0cb1bda27b71c747fc72f0a15..5bc23ba49ea6facfc728cf124c3bb526ed840454 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -131,7 +131,13 @@ COUNTRY_ITALIA=Italien
 COUNTRY_LUXEMBOURG=Luxemburg
 COUNTRY_NETHERLANDS=Niederlande
 COUNTRY_PHILIPPINES=Philippinen
-NONE_SELECTED=k.A.
+COUNTRY_POLAND=Polen
+COUNTRY_SWEDEN=Schweden
+COUNTRY_SWITZERLAND=Schweiz
+COUNTRY_TURKEY=T\u00fcrkei
+COUNTRY_THAILAND=Thailand
+COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
+NONE_SELECTED=Nichts ausgew\u00e4hlt
 ADDRESSBOOK_ID=Id-Nummer:
 ADDRESSBOOK_ID_TITLE=Identifizierende, eindeutige Nummer
 ADDRESSBOOK_NAME=Addressbuchname:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 11c234a294fec6c2b325492a16fd7162d0348938..709004a9383a6dd67a40c42338ca28b8b92545e5 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -132,6 +132,12 @@ COUNTRY_ITALIA=Italia
 COUNTRY_LUXEMBOURG=Luxembourg
 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.
 NONE_SELECTED=Empty
 ADDRESSBOOK_ID=Id number:
 ADDRESSBOOK_ID_TITLE=Identifying unique number

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/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" />