Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / mobile / admin_form_add_contact_mobile.tpl

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index 036ba693dd0153c03809eda6cb74b1d67d7a9ff9..ae82b71c9d8ee8dec3ae65973098e2f2c5da3661 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:generic="http://mxchange.org/jsf/core"
+       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui">
 
-       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-full" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
                        </div>
 
@@ -18,17 +19,17 @@
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
+                               <div class="table-right-medium">
+                                       <p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
                                                <f:converter converterId="MobileNumberConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
-                                       </h:selectOneMenu>
+                                       </p:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
@@ -36,24 +37,15 @@
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/mobile_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-                       </h:panelGroup>
+                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <widgets:inputMobileNumberPanelGrid targetController="#{adminPhoneController}" />
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-                               <h:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
+                               <p:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
                                        <f:param name="contactId" value="#{param.contactId}" />
-                               </h:commandButton>
+                               </p:commandButton>
                        </div>
                </h:panelGroup>
        </h:form>