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 e6234dc451b9dbf84bf23a43a813d8d1ff520e4e..5ba60c7f5dd74f7f507a01fe7d5cc144eed018a9 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
@@ -3,104 +3,126 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
-
-       <div class="para notice">
-               #{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}
-       </div>
-
-       <div class="para">
-               <fieldset id="country_data">
-                       <legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}</legend>
-
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <h:panelGroup styleClass="para notice" layout="block">
+               <h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
+       </h:panelGroup>
+
+       <h:panelGroup styleClass="para" layout="block">
+               <fieldset class="fieldset">
+                       <legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
-                                               <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
-                                       </h:inputText>
+                               <div class="table-right-medium">
+                                       <p:inputText id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
+                                               <f:validator validatorId="AbroadDialValidator" />
+                                       </p:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="countryAbroadDialPrefix" />
+                       </h:panelGroup>
 
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+                               <div class="table-right-medium">
+                                       <p:inputText id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
                                                <f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
-                                       </h:inputText>
+                                       </p:inputText>
 
-                                       <h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
+                                       <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="countryCode" />
+                       </h:panelGroup>
 
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+                               <div class="table-right-medium">
+                                       <p:inputText
+                                               id="countryI18nKey"
+                                               maxlength="100"
+                                               value="#{adminCountryController.countryI18nKey}"
+                                               required="true"
+                                               requiredMessage="#{msg.ADMIN_COUNTRY_I18N_KEY_REQUIRED}"
+                                               >
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
-                                       </h:inputText>
+                                       </p:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="countryI18nKey" />
+                       </h:panelGroup>
 
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIORED}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1" class="select">
+                               <div class="table-right-medium">
+                                       <h:selectOneListbox 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>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="countryIsLocalPrefixRequired" />
+                       </h:panelGroup>
 
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
-                                               <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
-                                       </h:inputText>
+                               <div class="table-right-medium">
+                                       <p:inputText id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
+                                               <f:validateLongRange minimum="0" maximum="99" />
+                                       </p:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="countryAbroadDialPrefix" />
+                       </h:panelGroup>
 
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
-                                               <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
-                                       </h:inputText>
+                               <div class="table-right-medium">
+                                       <p:inputText id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
+                                               <f:validateLongRange minimum="0" maximum="99" />
+                                       </p:inputText>
 
-                                       <h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
+                                       <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="countryPhoneCode" />
+                       </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>