Please cherry-pick:

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

diff --git a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
index 3b0981e044ba327a487c303fdb0010f780220575..f289866d04210790e8558de928528d00d221ce5e 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
@@ -4,33 +4,35 @@
        xmlns:widgets="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:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui">
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
-
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" styleClass="errors" rendered="#{empty labelMessage}" />
-
-       <ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
-               <h:panelGroup styleClass="table_row" layout="block">
-                       <div class="table_left_medium">
-                               <h:outputLabel for="mobileNumber" value="#{labelMessage}" />
+       <ui:fragment rendered="#{empty rendered or rendered == true}">
+               <h:panelGroup styleClass="table-row" layout="block">
+                       <div class="table-left-medium">
+                               <p:outputLabel for="mobileNumber" value="#{labelMessage}" />
                        </div>
 
-                       <div class="table_right_medium">
-                               <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
+                       <div class="table-right-medium">
+                               <p:selectOneMenu
+                                       id="mobileProvider"
+                                       value="#{targetController.mobileProvider}"
+                                       filter="true"
+                                       filterMatchMode="contains"
+                                       >
                                        <f:converter converterId="MobileProviderConverter" />
-                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                        <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-                               </h:selectOneMenu>
+                               </p:selectOneMenu>
 
-                               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+                               <p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
                                        <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-                               </h:inputText>
+                               </p:inputText>
                        </div>
                </h:panelGroup>
 
-               <h:panelGroup styleClass="error_container" layout="block">
-                       <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+               <h:panelGroup styleClass="error-container" layout="block">
+                       <p:message for="mobileNumber" />
                </h:panelGroup>
        </ui:fragment>
 </ui:composition>