X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fcountry%2Fadmin_country_list.xhtml;h=26b383ae5e7ba08b058e1b07cdf3f5b0ecc88e0d;hb=920d19e25bcf1c2f7788f7584616e92f7d97de59;hp=61a6c9375e6e947f545713413aa8ac3617f35c61;hpb=a666272d2559e28b3d3d22eb73e9cf48df0ce527;p=addressbook-war.git

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 61a6c937..26b383ae 100644
--- 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}"
@@ -16,9 +15,11 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">
+			<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,42 +27,48 @@
 				</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>
 			</h:dataTable>
 
-			<h:form id="add_country">
+			<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" />
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
 					</div>
 				</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>
