Continued a bit: (please cherry-pick)

[addressbook-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..b53e1d909654169b8c342a171a31802f4d4b0dbd 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
@@ -21,7 +21,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED}">
                                                <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
                                        </h:inputText>
                                </div>
@@ -29,7 +29,9 @@
                                <div class="clear"></div>
                        </div>
 
-                       <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       <div class="error_container">
+                               <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </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[c.countryI18nkey]})" />
                                        </h:selectOneMenu>
                                </div>