Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / input_fields / mobile_input_fields.tpl

diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index 02d81bd489341381054f442189a8fb05d853f36b..4ed663573c4d04b15fda6d046ed06f519413e03f 100644 (file)
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -5,17 +5,22 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+       <ui:fragment rendered="#{empty targetController}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
+
        <ui:fragment rendered="#{not empty targetController}">
                <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
                        <f:converter converterId="MobileProviderConverter" />
                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                       <f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+                       <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                </h:selectOneMenu>
 
                <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
                        <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>
-
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>