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 752e9f4928a36baf6273b1229714acd412baae08..0f056e3628a42bacae347b9d6ff1a8f9b06e271f 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -1,3 +1,4 @@
+<?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}"
@@ -8,10 +9,12 @@
         >
  
         <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">
@@ -52,7 +55,7 @@
                         </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>
@@ -63,7 +66,7 @@
                                                 <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}" />