Please cherry-pick:

[pizzaservice-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 4ed663573c4d04b15fda6d046ed06f519413e03f..1bfa5771e088a28590d194b3fd215b3d07d8600c 100644 (file)
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -6,21 +6,15 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{empty targetController}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+               <ui:include src="/WEB-INF/templates/messages/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.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:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+                       <ui:param name="targetController" value="#{adminContactController}" />
+               </ui:include>
        </ui:fragment>
 </ui:composition>