Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index 6ffb7660ec53283799f59c77c63539c967be4fa4..ec0c7db30164bdfafc7af6fe488e80f48578515a 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -1,48 +1,42 @@
 <?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/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>
-       </ui:fragment>
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
-               <ul class="mini_nav">
+               <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-                               <li class="mini_link">
-                                       <h:link outcome="admin_show_landline">
-                                               <h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
-                               <h:link outcome="admin_edit_landline">
-                                       <h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>
                        </li>
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_unlink_contact_landline">
-                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_delete_landline">
-                                       <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>
                        </li>