New "feature" controller introduced: (please cherry-pick this)

[jjobs-war.git] / web / admin / cellphone / admin_contact_cellphone_show.xhtml
diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml

index fc8483a8d2069d25473a8f4e8328c642e657ce32..7a8be2ad624f15fa17a5d4ff299bbbca1aa48929 100644 (file)
--- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
  
         <f:metadata>
-               <f:viewParam name="phoneId" value="#{adminContactPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
         </f:metadata>
  
         <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -19,19 +20,18 @@
  
                 <ui:define name="content">
                         <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
-                               <ui:param name="cellphoneNumber" value="#{adminContactPhoneController.cellPhone}" />
                                 <ui:param name="isShowPage" value="#{true}" />
                         </ui:include>
  
-                       <h:dataTable id="contact_cellphone_link" var="contact" value="#{adminContactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <h:dataTable id="contact_cellphone_link" var="contact" value="#{adminPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                 <f:facet name="header">
                                         <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS}">
-                                               <f:param value="#{adminContactPhoneController.cellPhone.phoneId}" />
+                                               <f:param value="#{adminPhoneController.cellPhone.phoneId}" />
                                         </h:outputFormat>
                                 </f:facet>
  
                                 <h:column>
-                                       <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CONTACT_ID}" />
+                                       <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
  
                                         <h:link id="contactId" styleClass="data_field" outcome="admin_show_contact">
                                                 <h:outputText value="#{contact.contactId}" />
@@ -40,31 +40,31 @@
                                 </h:column>
  
                                 <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
+                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
  
                                         <h:outputText id="contactGender" styleClass="data_field" value="#{msg[contact.contactGender.messageKey]}" />
                                 </h:column>
  
                                 <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
+                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
  
                                         <h:outputText id="contactTitle" styleClass="data_field" value="#{contact.contactTitle}" />
                                 </h:column>
  
                                 <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
+                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
  
                                         <h:outputText id="contactFirstName" styleClass="data_field" value="#{contact.contactFirstName}" />
                                 </h:column>
  
                                 <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
+                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
  
                                         <h:outputText id="contactFamilyName" styleClass="data_field" value="#{contact.contactFamilyName}" />
                                 </h:column>
  
                                 <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
+                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
  
                                         <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{contact.contactEmailAddress}">
                                                 <h:outputText value="#{contact.contactEmailAddress}" />
@@ -79,7 +79,7 @@
                                                         <li class="mini_link">
                                                                 <h:link outcome="admin_unlink_contact_cellphone">
                                                                         <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                                                       <f:param name="phoneId" value="#{adminContactPhoneController.cellPhone.phoneId}" />
+                                                                       <f:param name="phoneId" value="#{adminPhoneController.cellPhone.phoneId}" />
                                                                         <f:param name="contactId" value="#{contact.contactId}" />
                                                                 </h:link>
                                                         </li>