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 347e53505410757afcdeb8208c12a8c204160b8a..1c2773d39bd2cc33826c5ca119fb58d9adf8a68b 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -7,25 +7,29 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}</ui:define>
+               <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}" />
+                       </f:metadata>
+               </ui:define>
+
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_FAX}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">
-                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
                                <ui:param name="isShowPage" value="#{true}" />
                        </ui:include>
 
-                       <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" 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.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_LINKS}">
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
                                                <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                        </h:outputFormat>
                                </f:facet>
@@ -77,7 +81,7 @@
                                        <div class="table_data_field">
                                                <ul class="mini_nav">
                                                        <li class="mini_link">
-                                                               <h:link outcome="admin_unlink_contact_landline">
+                                                               <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}" />
                                                                        <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                                                        <f:param name="contactId" value="#{contact.contactId}" />