Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / contact / form_contact_data.tpl

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 124066046b31fbdbfa8a343a53ec0fa351642224..0619039dff25897dc7ff36f9a3f04e6464be20e8 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -12,7 +12,7 @@
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="personal_data">
+               <fieldset class="fieldset">
                        <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
                        </legend>
@@ -125,9 +125,9 @@
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="city" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="city" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -141,9 +141,9 @@
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="birthday" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="birthday" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -151,17 +151,13 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="country" value="#{contactController.country}">
-                                               <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="country" value="#{contactController.country}" />
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="country" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="country" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -169,11 +165,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.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 styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}" />
 
                                        <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
                                                <f:validator validatorId="PhoneNumberValidator" />
@@ -199,11 +191,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.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 styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}" />
 
                                        <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
@@ -228,7 +216,7 @@
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{userController.isPublicUserProfileEnabled()}">
-               <fieldset class="fieldset" id="profile_mode">
+               <fieldset class="fieldset">
                        <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
                                <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
                        </legend>