Please cherry-pick:

[jjobs-war.git] / web / admin / landline / admin_landline_show.xhtml

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index dba6795f9ab24e5dfb6e4da3ae52620618ba2be8..e14c2bc71976555dc1ea9ce15535f424250c2ff2 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -7,15 +7,19 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineConverter" 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_LAND_LINE}</ui:define>
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" 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_LAND_LINE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">
@@ -25,7 +29,7 @@
 
                        <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allLandLineNumberContacts()}" 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_LAND_LINE_LINKS}">
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
                                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:outputFormat>
                                </f:facet>