diff --git a/core/controllers/ListController.php b/core/controllers/ListController.php index 099fb7335e924f2dd0d44e2b0f9acf4932314462..5fc59997d13c0099700524a61bf78a94041fb725 100644 --- a/core/controllers/ListController.php +++ b/core/controllers/ListController.php @@ -184,7 +184,8 @@ abstract class ListController extends Controller /* 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 index 954b41e90f376a4395290822491ecfcfae286d3c..38d9b9dd757ddbf2d786cb61bebaa3c8b479d3de 100644 --- 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 index 13146fbf40db013f6d2312f8d264b72b6b2d9af6..5efcc5f2bfd0e2f2e25464ed4be6b9a9e333f659 100644 --- a/modules/CentreonAdministrationModule/controllers/AclresourceController.php +++ b/modules/CentreonAdministrationModule/controllers/AclresourceController.php @@ -40,7 +40,7 @@ use Centreon\Controllers\FormController; 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 index 660f8a118004e40872c726ae955f405667e8b569..cefe9a69d46aac18e11d710b92e24d0106f196f6 100644 --- a/modules/CentreonAdministrationModule/controllers/AuthController.php +++ b/modules/CentreonAdministrationModule/controllers/AuthController.php @@ -48,7 +48,7 @@ use Centreon\Internal\Utils\String\CamelCaseTransformation; */ 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 index 5045f622dab1d296fd23270a9f553197f3502ec8..6af0c3fc35a07c43c6e20577724688e8a4f77c6c 100644 --- a/modules/CentreonAdministrationModule/controllers/TagController.php +++ b/modules/CentreonAdministrationModule/controllers/TagController.php @@ -327,7 +327,8 @@ class TagController extends Controller /* 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 index 597be60b2514800ea64fb17f23d07cc442bf6ebf..93f6e9013b6a0b997964251776c7649c53bfd225 100644 --- a/modules/CentreonBamModule/controllers/BusinessActivityController.php +++ b/modules/CentreonBamModule/controllers/BusinessActivityController.php @@ -43,7 +43,7 @@ use CentreonAdministration\Repository\TagsRepository; 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 index d233fe691965ab4376dbba9c054ccbc040b95015..ec5698addcd8c983c7b0a7a03b5a09cfe42097dd 100644 --- a/modules/CentreonBamModule/controllers/BusinessActivityRealtimeController.php +++ b/modules/CentreonBamModule/controllers/BusinessActivityRealtimeController.php @@ -108,6 +108,7 @@ class BusinessActivityRealtimeController extends Controller $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 index 2a8503d1e6119a5c1dffbd88b8d18d300c8be70d..402de1daaff4e0a3e841dc6137a4ee70d308e5ce 100644 --- a/modules/CentreonConfigurationModule/controllers/ContactTemplateController.php +++ b/modules/CentreonConfigurationModule/controllers/ContactTemplateController.php @@ -40,7 +40,7 @@ use Centreon\Controllers\FormController; 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 index fb6c8f5044e44fb0b748ee39fe379bcf00761b1b..a461b60c39526b8eb32c01b506f707d3e0bc7493 100644 --- 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 index 1887166bd663b8f5138af7dd4bfee19c16e72f34..1e15b52447152cf8bf8ef21142758fb7d1a4a3c7 100644 --- a/modules/CentreonConfigurationModule/controllers/NotificationMethodController.php +++ b/modules/CentreonConfigurationModule/controllers/NotificationMethodController.php @@ -48,7 +48,7 @@ use Centreon\Controllers\FormController; */ 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 index f8184a6e4f9927702c08e86e21b6647b2fcaa156..20658692dc56451c62900eae1ce1770d2f5a8931 100644 --- a/modules/CentreonConfigurationModule/controllers/NotificationRuleController.php +++ b/modules/CentreonConfigurationModule/controllers/NotificationRuleController.php @@ -48,7 +48,7 @@ use Centreon\Controllers\FormController; */ 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 index d1283cd1ae13e0cfc5b8bafb35d8467d2662cef2..b2785ed14770164b3ea86c70e4a5308307a24701 100644 --- a/modules/CentreonConfigurationModule/controllers/ScheduledDowntimeController.php +++ b/modules/CentreonConfigurationModule/controllers/ScheduledDowntimeController.php @@ -49,7 +49,7 @@ use CentreonConfiguration\Repository\ScheduledDowntimeRepository; */ 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 index e8f91e74dbe4b8a9a03b174051e695268ea54ba2..8d3257a931b5d809c0e0eb25af2d5a2befb019a0 100644 --- a/modules/CentreonConfigurationModule/controllers/ServiceTemplateController.php +++ b/modules/CentreonConfigurationModule/controllers/ServiceTemplateController.php @@ -49,7 +49,7 @@ use CentreonAdministration\Repository\TagsRepository; */ 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 index d98266b039b3672a0fd3c9836f9c44689175c9b2..2c38a86c4f41da03fbadf9f3c12b3602ab8b1697 100644 --- 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 index 1db13eb0e6d837c524355cc1b2bc5652368edcc8..725a10af07bea1bfeaaf039da0c38bfee65f9d1a 100644 --- a/modules/CentreonRealtimeModule/controllers/DowntimesController.php +++ b/modules/CentreonRealtimeModule/controllers/DowntimesController.php @@ -109,6 +109,7 @@ class DowntimesController extends Controller $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 index 7ee4ddf10815b51a1559c6c2beed576d897c3bda..58d87613cbfae9b7cfba3a7abef142939719b826 100644 --- a/modules/CentreonRealtimeModule/controllers/HostController.php +++ b/modules/CentreonRealtimeModule/controllers/HostController.php @@ -119,6 +119,7 @@ class HostController extends Controller $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 index e38ee5f954ecc899cb218deabdd27b1820966544..bda8eab15168a1fb67942145c4107e97df48d855 100644 --- a/modules/CentreonRealtimeModule/controllers/ServiceController.php +++ b/modules/CentreonRealtimeModule/controllers/ServiceController.php @@ -114,6 +114,7 @@ class ServiceController extends Controller /* 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');