Please cherry-pick:

[jjobs-war.git] / web / admin / fax / admin_fax_show.xhtml

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 376c04b9733996d5089e90eb6078f21812abd00a..0af3d3123760255dcf06b8976e15f38c55c284ca 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -8,7 +9,7 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -21,11 +22,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                       <ui:param name="isShowPage" value="#{true}" />
-               </ui:include>
+               <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="true" />
 
-               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />
@@ -33,53 +32,53 @@
                        </f:facet>
 
                        <h:column>
-                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+                               <h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                               <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+                               <h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                               <h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                               <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                               <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                               <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                               <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+                               <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-                               <div class="table_data_field">
-                                       <ul class="mini_nav">
-                                               <li class="mini_link">
+                               <div class="table-data-field">
+                                       <ul class="navbar-mini">
+                                               <li class="navlink-mini">
                                                        <h:link outcome="admin_unlink_contact_fax">
-                                                               <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.faxNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </h:link>