Please cherry-pick:

[jjobs-war.git] / web / admin / mobile_provider / admin_mobile_provider_list.xhtml

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 8d30d8b19be303bc2db7e134e6d39b7c6d336971..345957e216598ca53eb8a597297bda7577348456 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
                </ui:define>
 
                <ui:define name="content">
@@ -47,7 +49,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
+                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nKey]}" />
                                </h:column>
 
                                <h:column>
@@ -61,8 +63,8 @@
                                </h:column>
                        </h:dataTable>
 
-                       <h:form id="add_mobile_provider_form">
-                               <div class="table_medium">
+                       <h:form id="form_add_mobile_provider">
+                               <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
                                        </div>
@@ -70,10 +72,10 @@
                                        <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.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_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
                                <div class="para notice">
                                        <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}" />