Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index e96f209a874871596c57700c5467e48047d2ad49..625f4ff7c7b6a5859519139b225b0d360a946028 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -1,21 +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:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <div class="para">
-               <fieldset class="fieldset" id="phone_data">
-                       <legend title="#{msg.ADMIN_MOBILE_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_MOBILE_DATA_LEGEND}" />
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.mobileNumber}">
+               <fieldset class="fieldset" id="mobile_data">
+                       <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
 
                                <div class="table_right_medium">
@@ -23,9 +24,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
                                </div>
@@ -34,18 +35,18 @@
                                        <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
                                                <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>
                                </div>
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
                                </div>
@@ -58,10 +59,10 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>