Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / resources / tags / table_rows / fax_input_table_row.tpl

diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
index f63bbd6e77ad7313e9c086a2b7cb656e18b36843..c8863cb143b17d006b778e65337e1f0f93da3251 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
@@ -1,41 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <ui:fragment rendered="#{empty rendered or rendered == true}">
-               <h:panelGroup styleClass="table-row" layout="block">
-                       <div class="table-left-medium">
-                               <p:outputLabel for="faxNumber" value="#{labelMessage}" />
-                       </div>
+       <p:row rendered="#{empty rendered or rendered == true}">
+               <p:outputLabel for="faxNumber" value="#{labelMessage}" />
 
-                       <div class="table-right-medium">
-                               <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.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>
+               <p:column>
+                       <core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
+                       <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+                               <f:validator validatorId="PhoneNumberValidator" />
+                       </p:inputText>
+                       <p:inputText id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+                               <f:validator validatorId="PhoneNumberValidator" />
+                       </p:inputText>
+               </p:column>
 
-                               <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
-                                       <f:validator validatorId="PhoneNumberValidator" />
-                               </p:inputText>
-
-                               <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
-                                       <f:validator validatorId="PhoneNumberValidator" />
-                               </p:inputText>
-                       </div>
-               </h:panelGroup>
-
-               <h:panelGroup styleClass="error-container" layout="block">
+               <p:column>
                        <p:message for="faxAreaCode" />
-               </h:panelGroup>
-
-               <h:panelGroup styleClass="error-container" layout="block">
                        <p:message for="faxNumber" />
-               </h:panelGroup>
-       </ui:fragment>
+               </p:column>
+       </p:row>
 </ui:composition>