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 57870cb441449bea06846f23bf4426b5f09c5394..651763e377dee8e612832fd0b73a000d33b34597 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
@@ -8,7 +8,12 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <core:outputMessageBox panelGroupId="errorHelperContactAddLandline" 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 rendered="#{not empty beanHelper.contact}">
                <h:panelGroup layout="block">
@@ -20,26 +25,31 @@
                                <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>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
-                                               <f:converter converterId="LandLineNumberConverter" />
+                       <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" />
 
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                       <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: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}" />