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

[addressbook-war.git] / web / admin / country / admin_country_list.xhtml
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml

index 73737268ab3cd7d923e1d0df58c1d50108423235..26b383ae5e7ba08b058e1b07cdf3f5b0ecc88e0d 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -1,4 +1,3 @@
-<?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}"
@@ -18,7 +17,9 @@
                 <ui:define name="content">
                         <h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{countryController.hasCountries()}">
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
+                                       </f:facet>
  
                                         <h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
                                                 <f:param name="countryId" value="#{country.countryId}" />
@@ -26,19 +27,25 @@
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
+                                       </f:facet>
  
                                         <h:outputText value="#{country.countryCode}" />
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+                                       </f:facet>
  
                                         <h:outputText value="#{country.countryExternalDialPrefix}" />
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
+                                       </f:facet>
  
                                         <h:outputText value="#{msg[country.countryI18nkey]}" />
                                 </h:column>
@@ -47,7 +54,7 @@
                         <h:form id="form_add_country">
                                 <div class="table_medium">
                                         <div class="table_header">
-                                               #{msg.ADMIN_ADD_COUNTRY_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
                                         </div>
  
                                         <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
@@ -59,9 +66,9 @@
                                 </div>
  
                                 <div class="para notice">
-                                       #{msg.ADMIN_ADD_COUNTRY_NOTICES}
+                                       <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_NOTICES}" />
                                         <ul>
-                                               <li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
+                                               <li><h:outputText value="#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}" /></li>
                                         </ul>
                                 </div>
                         </h:form>