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 6beca96232f78844bfb1ce6f04a6b75877893e81..270a7a5c917c2b70569c6f41ed14aabe32426872 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:links="http://mxchange.org/jsf/core/links"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,14 +15,14 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
+               <h:dataTable id="table_list_mobile" var="mobileProvider" value="#{mobileProviderController.allMobileProviders()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
-                               <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
-                                       <f:param name="providerId" value="#{mobile.providerId}" />
+                               <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
+                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
                                </h:link>
                        </h:column>
 
@@ -30,7 +31,7 @@
                                        <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
                                </f:facet>
 
-                               <h:outputText value="#{mobile.providerName}" />
+                               <h:outputText value="#{mobileProvider.providerName}" />
                        </h:column>
 
                        <h:column>
@@ -38,7 +39,7 @@
                                        <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
                                </f:facet>
 
-                               <h:outputText value="#{mobile.providerDialPrefix}" />
+                               <h:outputText value="#{mobileProvider.providerDialPrefix}" />
                        </h:column>
 
                        <h:column>
@@ -46,18 +47,26 @@
                                        <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
                                </f:facet>
 
-                               <h:outputText value="#{msg[mobile.providerCountry.countryI18nKey]}" />
+                               <h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
-                               <h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
+                               <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
                                        <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
                        </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                               </f:facet>
+
+                               <links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
+                       </h:column>
                </h:dataTable>
 
                <h:form id="form_add_mobile_provider">
@@ -70,7 +79,7 @@
 
                                <div class="table-footer">
                                        <h:commandButton styleClass="reset divider-right" 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()}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="button_add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
                                </div>
                        </h:panelGroup>