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 52cc1c225aba28977d3c978ee27b7ea172ae7133..bb9afb036ee336b980209b46c68856a994ec4d90 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,48 @@
 <?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">
 
-       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-               <ui:include src="/WEB-INF/templates/messages/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>
-       </ui:fragment>
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.landLineNumber}">
                <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: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">
+                               <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: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">
+                               <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:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>