Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / basic_company_data / admin_form_basic_company_data.tpl

diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
index 3c71f186a22858e155409182443b86d2171686dc..42911da2363340895f6cb1119e95631b75994dca 100644 (file)
--- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
+++ b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
@@ -8,7 +8,7 @@
        xmlns:p="http://primefaces.org/ui">
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="basic_company_data">
+               <fieldset class="fieldset">
                        <legend title="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND}" />
                        </legend>
@@ -170,11 +170,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminCompanyDataController.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="#{adminCompanyDataController.landLineCountry}" />
 
                                        <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
                                                <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
@@ -204,11 +200,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminCompanyDataController.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="#{adminCompanyDataController.faxCountry}" />
 
                                        <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />