Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / mobile_provider / admin_form_mobile_provider.tpl

diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 0b259e3460e3b89eb8a8a0a51f8591de13f953e6..4faff7598f6ed374d428e17176bb57a066f1a50f 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -10,7 +10,7 @@
        </div>
 
        <div class="para">
-               <fieldset id="mobile_provider">
+               <fieldset class="fieldset" id="mobile_provider">
                        <legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
                        </legend>
@@ -27,9 +27,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -63,8 +65,9 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
-                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+                                       <h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
+                                               <f:converter converterId="CountryConverter" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>