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 f8513a3d986a584d7052efa0c6871111249c61ae..7d3579bc0217da1a79af0eb65de4bf2646fe88e3 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -8,24 +8,27 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <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: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="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>
@@ -40,13 +43,13 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.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_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:column>
@@ -72,12 +75,12 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_FAX_UNLINK}" />
+                                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
                                        <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}" />