Merge branch 'master' of http://git.centreon.com/centreon

Sims24 · Jul 10, 2015 · aeb173a · aeb173a
2 parents 837bc06 + b66f436
commit aeb173a
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 14 deletions.
diff --git a/core/controllers/ListController.php b/core/controllers/ListController.php
@@ -184,7 +184,8 @@ public function listAction()
 
 
         /* Display variable */
-        $this->tpl->assign('objectName', $this->objectDisplayName);
+        $this->tpl->assign('objectDisplayName', $this->objectDisplayName);
+        $this->tpl->assign('objectName', static::$objectName);
         $this->tpl->assign('datatableObject', $this->datatableObject);
         $this->tpl->assign('moduleName', static::$moduleName);
         $this->tpl->assign('objectAddUrl', $this->objectBaseUrl . '/add');

diff --git a/core/views/tools/datatable.tpl b/core/views/tools/datatable.tpl
@@ -89,7 +89,7 @@
             <div class="buttonGroup btDatatable">
                 {if (isset($objectAddUrl) && !empty($objectAddUrl))}
                   <div class="configuration-actions">
-                    <button class="btnC btnSuccess" id="modalAdd">{t}Add {$objectName}{/t}</button>
+                    <button class="btnC btnSuccess" id="modalAdd">{t}Add {$objectDisplayName}{/t}</button>
                   </div>
                 {/if}
 

diff --git a/modules/CentreonAdministrationModule/controllers/AclresourceController.php b/modules/CentreonAdministrationModule/controllers/AclresourceController.php
@@ -40,7 +40,7 @@
 
 class AclresourceController extends FormController
 {
-    protected $objectDisplayName = 'AclResource';
+    protected $objectDisplayName = 'Acl Resource';
     public static $objectName = 'aclresource';
     protected $objectBaseUrl = '/centreon-administration/aclresource';
     protected $objectClass = '\CentreonAdministration\Models\Aclresource';

diff --git a/modules/CentreonAdministrationModule/controllers/AuthController.php b/modules/CentreonAdministrationModule/controllers/AuthController.php
@@ -48,7 +48,7 @@
  */
 class AuthController extends FormController{
 
-    protected $objectDisplayName = 'Auth';
+    protected $objectDisplayName = 'Authentication';
     public static $objectName = 'auth';
     public static $enableDisableFieldName = 'ar_enable';
     protected $datatableObject = '\CentreonAdministration\Internal\AuthDatatable';

diff --git a/modules/CentreonAdministrationModule/controllers/TagController.php b/modules/CentreonAdministrationModule/controllers/TagController.php
@@ -327,7 +327,8 @@ public function listeAction()
 
 
         /* Display variable */
-        $this->tpl->assign('objectName', $this->objectDisplayName);
+        $this->tpl->assign('objectName', static::$objectName);
+        $this->tpl->assign('objectDisplayName', $this->objectDisplayName);
         $this->tpl->assign('datatableObject', $this->datatableObject);
         $this->tpl->assign('moduleName', static::$moduleName);
         $this->tpl->assign('objectAddUrl', '');

diff --git a/modules/CentreonBamModule/controllers/BusinessActivityController.php b/modules/CentreonBamModule/controllers/BusinessActivityController.php
@@ -43,7 +43,7 @@
 
 class BusinessActivityController extends FormController
 {
-    protected $objectDisplayName = 'BusinessActivity';
+    protected $objectDisplayName = 'Business Activity';
     public static $objectName = 'businessactivity';
     public static $enableDisableFieldName = 'activate';
     protected $objectClass = '\CentreonBam\Models\BusinessActivity';

diff --git a/modules/CentreonBamModule/controllers/BusinessActivityRealtimeController.php b/modules/CentreonBamModule/controllers/BusinessActivityRealtimeController.php
@@ -108,6 +108,7 @@ public function displayHostsAction()
         $this->tpl->assign('moduleName', 'CentreonBam');
         $this->tpl->assign('datatableObject', $this->datatableObject);
         $this->tpl->assign('objectName', 'BusinessActivity');
+        $this->tpl->assign('objectDisplayName', 'Business Activity');
         //$this->tpl->assign('consoleType', 0); // host console
         $this->tpl->assign('objectListUrl', '/centreon-bam/businessactivity/realtime/list');
         /*

diff --git a/modules/CentreonConfigurationModule/controllers/ContactTemplateController.php b/modules/CentreonConfigurationModule/controllers/ContactTemplateController.php
@@ -40,7 +40,7 @@
 
 class ContactTemplateController extends FormController
 {
-    protected $objectDisplayName = 'Contacttemplate';
+    protected $objectDisplayName = 'Contact Template';
     public static $objectName = 'contacttemplate';
     public static $enableDisableFieldName = 'contact_activate';
     protected $objectBaseUrl = '/centreon-configuration/contacttemplate';

diff --git a/modules/CentreonConfigurationModule/controllers/HostTemplateController.php b/modules/CentreonConfigurationModule/controllers/HostTemplateController.php
@@ -49,7 +49,7 @@ class HostTemplateController extends FormController
      *
      * @var string 
      */
-    protected $objectDisplayName = 'Hosttemplate';
+    protected $objectDisplayName = 'Host Template';
 
     /**
      *

diff --git a/modules/CentreonConfigurationModule/controllers/NotificationMethodController.php b/modules/CentreonConfigurationModule/controllers/NotificationMethodController.php
@@ -48,7 +48,7 @@
  */
 class NotificationMethodController extends FormController
 {
-    protected $objectDisplayName = 'NotificationMethod';
+    protected $objectDisplayName = 'Notification Method';
     public static $objectName = 'notification-method';
     protected $objectBaseUrl = '/centreon-configuration/notification-method';
     protected $datatableObject = '\CentreonConfiguration\Internal\NotificationMethodDatatable';

diff --git a/modules/CentreonConfigurationModule/controllers/NotificationRuleController.php b/modules/CentreonConfigurationModule/controllers/NotificationRuleController.php
@@ -48,7 +48,7 @@
  */
 class NotificationRuleController extends FormController
 {
-    protected $objectDisplayName = 'NotificationRule';
+    protected $objectDisplayName = 'Notification Rule';
     public static $objectName = 'notification-rule';
     protected $objectBaseUrl = '/centreon-configuration/notification-rule';
     protected $datatableObject = '\CentreonConfiguration\Internal\NotificationRuleDatatable';

diff --git a/modules/CentreonConfigurationModule/controllers/ScheduledDowntimeController.php b/modules/CentreonConfigurationModule/controllers/ScheduledDowntimeController.php
@@ -49,7 +49,7 @@
  */
 class ScheduledDowntimeController extends FormController
 {
-    protected $objectDisplayName = 'ScheduledDowntime';
+    protected $objectDisplayName = 'Scheduled Downtime';
     public static $objectName = 'scheduled-downtime';
     public static $enableDisableFieldName = 'dt_activate';
     protected $objectBaseUrl = '/centreon-configuration/scheduled-downtime';

diff --git a/modules/CentreonConfigurationModule/controllers/ServiceTemplateController.php b/modules/CentreonConfigurationModule/controllers/ServiceTemplateController.php
@@ -49,7 +49,7 @@
  */
 class ServiceTemplateController extends FormController
 {
-    protected $objectDisplayName = 'ServiceTemplate';
+    protected $objectDisplayName = 'Service Template';
     public static $objectName = 'servicetemplate';
     public static $enableDisableFieldName = 'service_activate';
     protected $objectBaseUrl = '/centreon-configuration/servicetemplate';

diff --git a/modules/CentreonMainModule/views/list.tpl b/modules/CentreonMainModule/views/list.tpl
@@ -1,6 +1,6 @@
 {extends file="file:[Core]baseLayout.tpl"}
 
-{block name="title"}{$objectName}{/block}
+{block name="title"}{$objectDisplayName}{/block}
 
 {block name="content"}
 
@@ -11,7 +11,7 @@
 <div class="first-content"></div>
 
 {if isset($objectAddUrl)}
-    {datatable module=$moduleName object=$objectName datatableObject=$datatableObject displayActionBar=$displayActionBar objectAddUrl=$objectAddUrl}
+    {datatable module=$moduleName object=$objectName objectDisplayName=$objectDisplayName datatableObject=$datatableObject displayActionBar=$displayActionBar objectAddUrl=$objectAddUrl}
 {else}
     {datatable module=$moduleName object=$objectName datatableObject=$datatableObject displayActionBar=$displayActionBar}
 {/if}

diff --git a/modules/CentreonRealtimeModule/controllers/DowntimesController.php b/modules/CentreonRealtimeModule/controllers/DowntimesController.php
@@ -109,6 +109,7 @@ public function displayDowntimesAction()
         $this->tpl->assign('moduleName', 'CentreonRealtime');
         $this->tpl->assign('datatableObject', $this->datatableObject);
         $this->tpl->assign('objectName', 'Downtimes');
+        $this->tpl->assign('objectDisplayName', 'Downtimes');
         $this->tpl->assign('consoleType', 0); // host console
         $this->tpl->assign('objectListUrl', '/centreon-realtime/downtimes/list');
 

diff --git a/modules/CentreonRealtimeModule/controllers/HostController.php b/modules/CentreonRealtimeModule/controllers/HostController.php
@@ -119,6 +119,7 @@ public function displayHostsAction()
         $this->tpl->assign('moduleName', 'CentreonRealtime');
         $this->tpl->assign('datatableObject', $this->datatableObject);
         $this->tpl->assign('objectName', 'Host');
+        $this->tpl->assign('objectDisplayName', 'Host');
         $this->tpl->assign('objectListUrl', '/centreon-realtime/host/list');
 
         $actions = array();

diff --git a/modules/CentreonRealtimeModule/controllers/ServiceController.php b/modules/CentreonRealtimeModule/controllers/ServiceController.php
@@ -114,6 +114,7 @@ public function displayServicesAction()
         /* Datatable */
         $tpl->assign('moduleName', 'CentreonRealtime');
         $tpl->assign('datatableObject', $this->datatableObject);
+        $tpl->assign('objectDisplayName', 'Service');
         $tpl->assign('objectName', 'Service');
         $tpl->assign('objectListUrl', '/centreon-realtime/service/list');
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ class HostTemplateController extends FormController @@
          *
          * @var string
          */
-        protected $objectDisplayName = 'Hosttemplate';
+        protected $objectDisplayName = 'Host Template';
         /**
          *
@@ Expand Down @@