Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / resources / tags / admin / panel_grids / landline / admin_landline_data.tpl

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index 8017577e243e1502c8417479f0b4db553553cfaf..e7a75daaaed93dac1cb1c2d36deec4b536e24792 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -2,20 +2,19 @@
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" />
-
-       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
                                <h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
 
@@ -45,11 +44,11 @@
                        </h:outputText>
                </h:column>
 
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+               <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
                        <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <div class="table-data-field">
-                               <widgets:outputAdminLandLineLinks landLineNumber="#{landLineNumber}" isShowPage="#{isShowPage}" />
+                               <links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
                        </div>
                </h:column>
        </h:panelGrid>