</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}" />
</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>