removed double-redundant XML parsing instructions, (X)HTML doesn't want it anyway

[addressbook-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 5c746261e2edfe886d71191107b11f6a2ff9ad80..7d0e1af44e5f42deacef0dc336300710e0d6d5d9 100644 (file)
--- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -1,9 +1,8 @@
-<?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
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
         xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://java.sun.com/jsf/facelets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         >
@@ -33,7 +32,7 @@
                                 </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}" />
@@ -42,31 +41,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}" />
@@ -74,9 +73,9 @@
                                 </h:column>
  
                                 <h:column>
-                                       <h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
+                                       <h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
  
-                                       <div id="cellphoneLinks" class="data_field">
+                                       <div class="data_field">
                                                 <ul class="mini_nav">
                                                         <li class="mini_link">
                                                                 <h:link outcome="admin_unlink_contact_cellphone">