Please cherry-pick:

[jjobs-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 26b383ae5e7ba08b058e1b07cdf3f5b0ecc88e0d..d821574a899fe5f546d25876ca44e2f6138833db 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -8,14 +8,16 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}" />
                </ui:define>
 
                <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: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="#{not countryController.allCountries().isEmpty()}">
                                <h:column>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
@@ -47,12 +49,12 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[country.countryI18nkey]}" />
+                                       <h:outputText value="#{msg[country.countryI18nKey]}" />
                                </h:column>
                        </h:dataTable>
 
                        <h:form id="form_add_country">
-                               <div class="table_medium">
+                               <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
                                        </div>
@@ -60,10 +62,10 @@
                                        <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="reset right_space" 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>
+                               </h:panelGroup>
 
                                <div class="para notice">
                                        <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_NOTICES}" />