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 6a9b987f13b75333caaf940e4e5382c5b89a664e..782d201526250e638bb0e94ad4aac7ca52d32967 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -1,16 +1,25 @@
 <?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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <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.notifyControllerFaxNumberConverted()}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -23,11 +32,16 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
-
-               <p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+               <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
+
+               <p:dataTable
+                       id="contact_fax_link"
+                       var="contact"
+                       value="#{contactPhoneController.allCurrentFaxNumberContacts()}"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+                       >
                        <f:facet name="header">
-                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
+                               <h:outputFormat value="#{msg.ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                </h:outputFormat>
                        </f:facet>
@@ -35,7 +49,12 @@
                        <p:column>
                                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <p:link
+                                       id="contactId"
+                                       styleClass="table-data-field"
+                                       outcome="admin_show_contact"
+                                       value="#{contact.contactId}"
+                                       >
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </p:link>
                        </p:column>
@@ -67,7 +86,11 @@
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link
+                                       id="contactEmailAddress"
+                                       styleClass="table-data-field"
+                                       href="mailto:#{contact.contactEmailAddress}"
+                                       >
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </p:column>
@@ -78,9 +101,11 @@
                                <div class="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
-                                                       <p:link outcome="admin_unlink_contact_fax">
+                                                       <p:link
+                                                               outcome="admin_unlink_contact_fax"
+                                                               >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
-                                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                                                               <f:param name="faxId" value="#{beanHelper.faxNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
                                                </li>