]> git.mxchange.org Git - jjobs-war.git/blobdiff - web/admin/country/admin_country_list.xhtml
Please cherry-pick:
[jjobs-war.git] / web / admin / country / admin_country_list.xhtml
index 87a8347b2dbfa9dba1fd169605e159c2ea3e8bf6..d821574a899fe5f546d25876ca44e2f6138833db 100644 (file)
@@ -1,22 +1,27 @@
-<?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 xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
 
        <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="#{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="#{not countryController.allCountries().isEmpty()}">
                                <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:outputText value="#{msg[country.countryI18nKey]}" />
                                </h:column>
                        </h:dataTable>
 
-                       <h:form id="add_country">
-                               <div class="table_medium">
+                       <h:form id="form_add_country">
+                               <h:panelGroup styleClass="table_medium" layout="block">
                                        <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 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">
-                                       #{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>