Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / branch_offices / admin_form_branch_offices_data.tpl

diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
index 48dd6e59365babc7ffc21e0cd5623baedad2517f..48f7352ec04ecdb347cb4b8de49c6033ddd9ac4b 100644 (file)
--- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
@@ -8,7 +8,7 @@
        xmlns:p="http://primefaces.org/ui">
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="admin_branch_office_basic">
+               <fieldset class="fieldset">
                        <legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
                        </legend>
@@ -19,7 +19,14 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
+                                       <p:selectOneMenu
+                                               id="branchCompany"
+                                               value="#{adminBranchOfficeController.branchCompany}"
+                                               filter="true"
+                                               filterMatchMode="contains"
+                                               required="true"
+                                               requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
+                                               >
                                                <f:converter converterId="BasicCompanyDataConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
                                                <f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
@@ -37,7 +44,12 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchContactEmployee" value="#{adminBranchOfficeController.branchContactEmployee}">
+                                       <p:selectOneMenu
+                                               id="branchContactEmployee"
+                                               value="#{adminBranchOfficeController.branchContactEmployee}"
+                                               filter="true"
+                                               filterMatchMode="contains"
+                                               >
                                                <f:converter converterId="CompanyEmployeeConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
@@ -55,7 +67,12 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchUserOwner" value="#{adminBranchOfficeController.branchUserOwner}">
+                                       <p:selectOneMenu
+                                               id="branchUserOwner"
+                                               value="#{adminBranchOfficeController.branchUserOwner}"
+                                               filter="true"
+                                               filterMatchMode="contains"
+                                               >
                                                <f:converter converterId="UserConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
@@ -90,11 +107,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminBranchOfficeController.landLineCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
+                                       <widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.landLineCountry}" />
 
                                        <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
                                                <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
@@ -124,11 +137,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminBranchOfficeController.faxCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
+                                       <widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.faxCountry}" />
 
                                        <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
@@ -256,11 +265,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchCountry" value="#{adminBranchOfficeController.branchCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-                                       </p:selectOneMenu>
+                                       <widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
                                </div>
                        </h:panelGroup>