MOJARRA - Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / admin / landline / admin_form_landline_data.tpl

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index 98f95d66a704ad9260abf86a98a79ca119567edf..f10df164f24a665bac9b605986f537926dba854f 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -1,56 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:generic="http://mxchange.org/jsf/core"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
+       <generic:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+
+       <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
+               <div class="para">
+                       <fieldset class="fieldset" id="landline_data">
+                               <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
+                               </legend>
+
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       </div>
+
+                                       <div class="table_right_medium">
+                                               <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
+                                       </div>
+
+                                       <div class="table_right_medium">
+                                               <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
+                                                       <ui:param name="targetController" value="#{adminPhoneController}" />
+                                               </ui:include>
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </fieldset>
+               </div>
        </ui:fragment>
-
-       <div class="para">
-               <fieldset class="fieldset" id="landline_data">
-                       <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
-                       </legend>
-
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-               </fieldset>
-       </div>
 </ui:composition>