Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / country / admin_form_country_data.tpl

diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index cbed24ae28f8379368e030227f356d846db55eaa..d80453c925272243e8042ae958215137c7ba8f0f 100644 (file)
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -15,117 +15,105 @@
                                <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
                                                <f:validator validatorId="AbroadDialValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
                                                <f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
                                        </h:inputText>
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryI18nKey" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryI18nKey" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneListbox styleClass="select" required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
                                                <f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
                                                <f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
                                        </h:selectOneListbox>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryIsLocalPrefixRequired" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryIsLocalPrefixRequired" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
                                                <f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
                                                <f:validateLongRange for="countryPhoneCode" minimum="0" maximum="99" />
                                        </h:inputText>
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryPhoneCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryPhoneCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>