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 028f6359b9ec2b294c058c0a8d655df30cc6a138..782d201526250e638bb0e94ad4aac7ca52d32967 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -11,7 +11,14 @@
 
        <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: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>
@@ -42,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>
@@ -74,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>
@@ -85,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>