Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / landline / admin_form_add_contact_landline.tpl

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index d2357275f8d4d25a221593f0d37b7a3fa4625919..722fe3ba7edf28bf07c7b55e840ad67620591eb4 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -1,16 +1,22 @@
 <?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://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <widgets:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHelperContactAddLandline"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
-       <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{not empty beanHelper.contact}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
                        </div>
@@ -19,33 +25,49 @@
                                <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">
-                                       <p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
-                               </div>
+                       <p:panelGrid
+                               layout="grid"
+                               columns="2"
+                               >
+                               <p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
+                               <p:selectOneMenu
+                                       id="landLineNumber"
+                                       styleClass="select"
+                                       value="#{adminPhoneController.landLineNumber}"
+                                       >
+                                       <f:converter converterId="LandLineNumberConverter" />
 
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
-                                               <f:converter converterId="LandLineNumberConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+
+                                       <f:selectItems
+                                               value="#{adminPhoneController.allNonLinkedLandLineNumbers}"
+                                               var="landlineNumber"
+                                               itemValue="#{landlineNumber}"
+                                               itemLabel="#{beanHelper.renderPhoneNumber(landlineNumber)}"
+                                               />
+                               </p:selectOneMenu>
+                       </p:panelGrid>
 
                        <div class="para">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
                        </div>
 
-                       <widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
+                       <core:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
 
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
+                               <p:commandButton
+                                       type="submit"
+                                       action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}"
+                                       >
                                        <f:param name="contactId" value="#{param.contactId}" />
                                </p:commandButton>
-                       </div>
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>