diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php index df9d241a6..dd41c193e 100644 --- a/application/forms/Config/Authentication/DbBackendForm.php +++ b/application/forms/Config/Authentication/DbBackendForm.php @@ -93,7 +93,7 @@ class DbBackendForm extends BaseBackendForm ) ); - $this->setSubmitLabel('Save backend'); + $this->setSubmitLabel('{{SAVE_ICON}} Save backend'); } /** diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php index d186712f0..087761bd9 100644 --- a/application/forms/Config/Authentication/LdapBackendForm.php +++ b/application/forms/Config/Authentication/LdapBackendForm.php @@ -130,7 +130,7 @@ class LdapBackendForm extends BaseBackendForm ) ); - $this->setSubmitLabel('Save Backend'); + $this->setSubmitLabel('{{SAVE_ICON}} Save Backend'); } /** diff --git a/application/forms/Config/AuthenticationForm.php b/application/forms/Config/AuthenticationForm.php index 1ec5068a8..2532ebba9 100644 --- a/application/forms/Config/AuthenticationForm.php +++ b/application/forms/Config/AuthenticationForm.php @@ -302,7 +302,7 @@ class AuthenticationForm extends Form $this->addPersistentState(); $this->enableConditionalDecorator(); - $this->setSubmitLabel('Save Changes'); + $this->setSubmitLabel('{{SAVE_ICON}} Save Changes'); } /** diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php index 5489a830f..031f0fdb5 100644 --- a/application/forms/Config/GeneralForm.php +++ b/application/forms/Config/GeneralForm.php @@ -329,7 +329,7 @@ class GeneralForm extends Form $this->addDateFormatSettings($global); $this->addUserPreferencesDialog($preferences); - $this->setSubmitLabel('Save Changes'); + $this->setSubmitLabel('{{SAVE_ICON}} Save Changes'); } /** diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php index bf426f342..7528031f0 100644 --- a/application/forms/Config/LoggingForm.php +++ b/application/forms/Config/LoggingForm.php @@ -190,7 +190,7 @@ class LoggingForm extends Form $this->enableAutoSubmit(array('logging_debug_enable')); - $this->setSubmitLabel('Save Changes'); + $this->setSubmitLabel('{{SAVE_ICON}} Save Changes'); } /** diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php index dcc1dbc3a..1784517f9 100644 --- a/application/forms/Dashboard/AddUrlForm.php +++ b/application/forms/Dashboard/AddUrlForm.php @@ -89,7 +89,7 @@ class AddUrlForm extends Form $txtCreatePane = new Zend_Form_Element_Text( 'pane', array( - 'label' => 'New dashboard title', + 'label' => 'New Dashboard Title', 'required' => true, 'style' => 'display:inline-block' ) @@ -107,7 +107,7 @@ class AddUrlForm extends Form $cancelDashboardBtn = new Zend_Form_Element_Submit( 'use_existing_dashboard', array( - 'label' => 'X', + 'label' => '{{REMOVE_ICON}}', 'required' => false, 'style' => 'display:inline-block' ) @@ -159,7 +159,7 @@ class AddUrlForm extends Form 'required' => true, ) ); - $this->setSubmitLabel("Add to dashboard"); + $this->setSubmitLabel("{{CREATE_ICON}} Add To Dashboard"); } } diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php index 306439a17..5d14429bf 100644 --- a/application/forms/Preference/GeneralForm.php +++ b/application/forms/Preference/GeneralForm.php @@ -223,7 +223,7 @@ class GeneralForm extends Form $this->addTimezoneSelection($global); $this->addDateFormatSettings($global); - $this->setSubmitLabel('Save Changes'); + $this->setSubmitLabel('{{SAVE_ICON}} Save Changes'); } /** diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php index eabf29863..659f38d35 100644 --- a/application/views/helpers/FormDateTime.php +++ b/application/views/helpers/FormDateTime.php @@ -49,7 +49,7 @@ class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement // Is it disabled? $disabled = ''; - if ($disable) { + if ($disabled) { $disabled = ' disabled="disabled"'; } diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php index 724c5ccb0..7366cb511 100644 --- a/library/Icinga/Web/Widget/Dashboard.php +++ b/library/Icinga/Web/Widget/Dashboard.php @@ -143,12 +143,12 @@ class Dashboard implements Widget if (!@file_put_contents($file, $iniString)) { $error = error_get_last(); if ($error == null) { - $error = 'Unknown error'; + $error = 'Unknown Error'; } else { $error = $error['message']; } Logger::error('Tried to persist dashboard to %s, but got error: %s', $file, $error); - throw new ConfigurationError('Can\'t persist dashboard'); + throw new ConfigurationError('Can\'t Persist Dashboard'); } else { return $this; } diff --git a/library/Icinga/Web/Widget/Dashboard/Component.php b/library/Icinga/Web/Widget/Dashboard/Component.php index 8c138e593..c71b3d5e8 100644 --- a/library/Icinga/Web/Widget/Dashboard/Component.php +++ b/library/Icinga/Web/Widget/Dashboard/Component.php @@ -81,14 +81,17 @@ class Component implements Widget */ private $template =<<<'EOD' -
- {TITLE} - X - -
- +
+
+ {TITLE} + +
+
+
EOD; diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php index cc4d3a606..1289c3901 100644 --- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php +++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php @@ -51,7 +51,6 @@ class BasketAction implements Tabextension 'basket', array( 'title' => 'URL Basket', - 'icon' => 'img/classic/basket.png', 'url' => Url::fromPath('basket/add'), 'urlParams' => array( 'url' => Url::fromRequest()->getRelativeUrl() diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php index 2f9d1163e..cb4e26180 100644 --- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php +++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php @@ -52,8 +52,7 @@ class DashboardAction implements Tabextension $tabs->addAsDropdown( 'dashboard', array( - 'title' => 'Add to Dashboard', - 'iconCls' => 'dashboard', + 'title' => '{{DASHBOARD_ICON}} Add To Dashboard', 'url' => Url::fromPath('dashboard/addurl'), 'urlParams' => array( 'url' => Url::fromRequest()->getRelativeUrl() diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php index 47cef18d1..1d4882585 100644 --- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php +++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php @@ -64,20 +64,17 @@ class OutputFormat implements Tabextension private $supportedTypes = array( self::TYPE_PDF => array( 'name' => 'pdf', - 'title' => 'PDF', - 'icon' => 'img/classic/application-pdf.png', + 'title' => '{{PDF_ICON}} PDF', 'urlParams' => array('filetype' => 'pdf') ), self::TYPE_CSV => array( 'name' => 'csv', - 'title' => 'CSV', - 'icon' => 'img/classic/application-csv.png', + 'title' => '{{CSV_ICON}} CSV', 'urlParams' => array('filetype' => 'csv') ), self::TYPE_JSON => array( 'name' => 'json', - 'title' => 'JSON', - 'icon' => 'img/classic/application-json.png', + 'title' => '{{JSON_ICON}} JSON', 'urlParams' => array('filetype' => 'json') ) ); diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php index dc3e53b1b..a64c34b03 100644 --- a/modules/monitoring/application/controllers/CommandController.php +++ b/modules/monitoring/application/controllers/CommandController.php @@ -126,7 +126,7 @@ class Monitoring_CommandController extends ModuleActionController $targetInfo = $targetConfig->current(); // Take the very first section if ($targetInfo === false) { - throw new ConfigurationError("Not any instances are configured yet"); + throw new ConfigurationError("No instances are configured yet"); } else { $this->target = new CommandPipe($targetInfo); } @@ -247,7 +247,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable active checks')); + $form->setSubmitLabel(t('Disable Active Checks')); $form->addNote(t('Disable active checks for this object.')); $this->setForm($form); @@ -356,7 +356,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Stop accepting passive checks')); + $form->setSubmitLabel(t('Stop Accepting Passive Checks')); $form->addNote(t('Passive checks for this object will be omitted.')); $this->setForm($form); @@ -374,7 +374,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Start accepting passive checks')); + $form->setSubmitLabel(t('Start Accepting Passive Checks')); $form->addNote(t('Passive checks for this object will be accepted.')); $this->setForm($form); @@ -392,7 +392,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable notifications')); + $form->setSubmitLabel(t('Disable Notifications')); $form->addNote(t('Notifications for this object will be disabled.')); $this->setForm($form); @@ -409,7 +409,7 @@ class Monitoring_CommandController extends ModuleActionController { $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable notifications')); + $form->setSubmitLabel(t('Enable Notifications')); $form->addNote(t('Notifications for this object will be enabled.')); $this->setForm($form); @@ -478,7 +478,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Remove downtime(s)')); + $form->setSubmitLabel(t('Remove Downtime(s)')); $form->addNote(t('Remove downtime(s) from this host and its services.')); $this->setForm($form); @@ -496,7 +496,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable notifications')); + $form->setSubmitLabel(t('Disable Notifications')); $form->addNote(t('Notifications for this host and its services will be disabled.')); $this->setForm($form); @@ -515,7 +515,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable notifications')); + $form->setSubmitLabel(t('Enable Notifications')); $form->addNote(t('Notifications for this host and its services will be enabled.')); $this->setForm($form); @@ -559,7 +559,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable active checks')); + $form->setSubmitLabel(t('Disable Active Checks')); $form->addNote(t('Disable active checks for this host and its services.')); $this->setForm($form); @@ -578,7 +578,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable active checks')); + $form->setSubmitLabel(t('Enable Active Checks')); $form->addNote(t('Enable active checks for this host and its services.')); $this->setForm($form); @@ -597,7 +597,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable event handler')); + $form->setSubmitLabel(t('Disable Event Handler')); $form->addNote(t('Disable event handler for this object.')); $this->setForm($form); @@ -615,7 +615,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable event handler')); + $form->setSubmitLabel(t('Enable Event Handler')); $form->addNote(t('Enable event handler for this object.')); $this->setForm($form); @@ -633,7 +633,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable flapping detection')); + $form->setSubmitLabel(t('Disable Flapping Detection')); $form->addNote(t('Disable flapping detection for this object.')); $this->setForm($form); @@ -651,7 +651,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable flapping detection')); + $form->setSubmitLabel(t('Enable Flapping Detection')); $form->addNote(t('Enable flapping detection for this object.')); $this->setForm($form); @@ -686,7 +686,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Reset attributes')); + $form->setSubmitLabel(t('Reset Attributes')); $form->addNote(t('Reset modified attributes to its default.')); $this->setForm($form); @@ -721,7 +721,7 @@ class Monitoring_CommandController extends ModuleActionController $this->setSupportedParameters(array('host', 'service')); $form = new CommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Remove problem acknowledgement')); + $form->setSubmitLabel(t('Remove Problem Acknowledgement')); $form->addNote(t('Remove problem acknowledgement for this object.')); $this->setForm($form); @@ -757,9 +757,9 @@ class Monitoring_CommandController extends ModuleActionController $form = new CommandWithIdentifierForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Delete downtime')); + $form->setSubmitLabel(t('Delete Downtime')); $form->setFieldName('downtimeid'); - $form->setFieldLabel(t('Downtime id')); + $form->setFieldLabel(t('Downtime Id')); $form->addNote(t('Delete a single downtime with the id shown above')); $this->setForm($form); diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index 9c9ffda19..a31c05fe5 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -397,8 +397,7 @@ class Monitoring_ShowController extends ModuleActionController $tabs->add( 'host', array( - 'title' => 'Host', - 'icon' => 'img/classic/server.png', + 'title' => '{{HOST_ICON}} Host', 'url' => 'monitoring/show/host', 'urlParams' => $params, ) @@ -407,8 +406,7 @@ class Monitoring_ShowController extends ModuleActionController $tabs->add( 'services', array( - 'title' => 'Services', - 'icon' => 'img/classic/service.png', + 'title' => '{{SERVICE_ICON}} Services', 'url' => 'monitoring/show/services', 'urlParams' => $params, ) @@ -418,8 +416,7 @@ class Monitoring_ShowController extends ModuleActionController $tabs->add( 'service', array( - 'title' => 'Service', - 'icon' => 'img/classic/service.png', + 'title' => '{{SERVICE_ICON}} Service', 'url' => 'monitoring/show/service', 'urlParams' => $params, ) @@ -428,8 +425,7 @@ class Monitoring_ShowController extends ModuleActionController $tabs->add( 'history', array( - 'title' => 'History', - 'icon' => 'img/classic/history.gif', + 'title' => '{{HISTORY_ICON}} History', 'url' => 'monitoring/show/history', 'urlParams' => $params, ) diff --git a/modules/monitoring/application/forms/Command/CommentForm.php b/modules/monitoring/application/forms/Command/CommentForm.php index 61e87f1a5..ec9a1a7bf 100644 --- a/modules/monitoring/application/forms/Command/CommentForm.php +++ b/modules/monitoring/application/forms/Command/CommentForm.php @@ -94,7 +94,7 @@ class CommentForm extends CommandForm ) ); - $this->setSubmitLabel(t('Post comment')); + $this->setSubmitLabel(t('Post Comment')); parent::create(); } diff --git a/modules/monitoring/application/forms/Command/DelayNotificationForm.php b/modules/monitoring/application/forms/Command/DelayNotificationForm.php index f2eec200d..b44bbdcf1 100644 --- a/modules/monitoring/application/forms/Command/DelayNotificationForm.php +++ b/modules/monitoring/application/forms/Command/DelayNotificationForm.php @@ -57,7 +57,7 @@ class DelayNotificationForm extends CommandForm 'text', 'minutes', array( - 'label' => t('Notification Delay (minutes from now)'), + 'label' => t('Notification Delay (Minutes From Now)'), 'style' => 'width: 80px;', 'value' => 0, 'required' => true, diff --git a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php index 91ecc9d70..da7337c6e 100644 --- a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php +++ b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php @@ -199,7 +199,7 @@ class EditBackendForm extends Form 'checkbox', 'backend_disable', array( - 'label' => 'Disable this Backend', + 'label' => 'Disable This Backend', 'required' => true, 'value' => $this->backend->disabled ) @@ -260,7 +260,7 @@ class EditBackendForm extends Form return; } $this->addDisableButton(); - $this->setSubmitLabel('Save Changes'); + $this->setSubmitLabel('{{SAVE_ICON}} Save Changes'); } /** diff --git a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php index b3fcec8a9..d8008addd 100644 --- a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php +++ b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php @@ -77,6 +77,6 @@ class ConfirmRemovalForm extends Form 'required' => true ) ); - $this->setSubmitLabel('Confirm Removal'); + $this->setSubmitLabel('{{REMOVE_ICON}} Confirm Removal'); } } diff --git a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php index 3ba39127f..e47268e8d 100644 --- a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php @@ -154,7 +154,7 @@ class EditInstanceForm extends Form 'helptext' => 'The file path where the icinga commandpipe can be found' ) ); - $this->setSubmitLabel('Save'); + $this->setSubmitLabel('{{SAVE_ICON}} Save'); } /** diff --git a/modules/monitoring/application/views/helpers/MonitoringCommands.php b/modules/monitoring/application/views/helpers/MonitoringCommands.php index f4a7af963..58bc3cb55 100644 --- a/modules/monitoring/application/views/helpers/MonitoringCommands.php +++ b/modules/monitoring/application/views/helpers/MonitoringCommands.php @@ -80,7 +80,7 @@ class Zend_View_Helper_MonitoringCommands extends Zend_View_Helper_Abstract $out .= '
'; if ($type === Meta::TYPE_FULL) { - return '
'. $out. '
'; + return '
'. $out. '
'; } return $out; diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php index fb6eafe8d..ccecfa303 100644 --- a/modules/monitoring/application/views/helpers/MonitoringFlags.php +++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php @@ -37,12 +37,12 @@ class Zend_View_Helper_MonitoringFlags extends Zend_View_Helper_Abstract * @var string[] */ private static $keys = array( - 'passive_checks_enabled' => 'Passive checks', - 'active_checks_enabled' => 'Active checks', + 'passive_checks_enabled' => 'Passive Checks', + 'active_checks_enabled' => 'Active Checks', 'obsessing' => 'Obsessing', 'notifications_enabled' => 'Notifications', - 'event_handler_enabled' => 'Event handler', - 'flap_detection_enabled' => 'Flap detection', + 'event_handler_enabled' => 'Event Handler', + 'flap_detection_enabled' => 'Flap Detection', ); /** diff --git a/modules/monitoring/library/Monitoring/Command/Meta.php b/modules/monitoring/library/Monitoring/Command/Meta.php index fc0abc41a..f2fd3c893 100644 --- a/modules/monitoring/library/Monitoring/Command/Meta.php +++ b/modules/monitoring/library/Monitoring/Command/Meta.php @@ -115,149 +115,149 @@ class Meta */ private static $commandInformation = array( self::CMD_DISABLE_ACTIVE_CHECKS => array( - 'Disable active checks for this %s', // Long description (mandatory) - 'Disable active checks', // Short description (mandatory) + 'Disable Active Checks For This %s', // Long description (mandatory) + 'Disable Active Checks', // Short description (mandatory) '', // Icon anything (optional) '' // Button css cls (optional) ), self::CMD_ENABLE_ACTIVE_CHECKS => array( - 'Enable active checks for this %s', - 'Enable active checks', + 'Enable Active Checks For This %s', + 'Enable Active Checks', '' ), self::CMD_RESCHEDULE_NEXT_CHECK => array( - 'Reschedule next service check', + 'Reschedule Next Service Check', 'Recheck', '', 'btn-success' ), self::CMD_SUBMIT_PASSIVE_CHECK_RESULT => array( - 'Submit passive check result', - 'Submit check result', + 'Submit Passive Check Result', + 'Submit Check Result', '' ), self::CMD_STOP_OBSESSING => array( - 'Stop obsessing over this %s', - 'Stop obsessing', + 'Stop Obsessing Over This %s', + 'Stop Obsessing', '' ), self::CMD_START_OBSESSING => array( - 'Start obsessing over this %s', - 'Start obsessing', + 'Start Obsessing Over This %s', + 'Start Obsessing', '' ), self::CMD_STOP_ACCEPTING_PASSIVE_CHECKS => array( - 'Stop accepting passive check for this %s', - 'Stop passive checks', + 'Stop Accepting Passive Checks For This %s', + 'Stop Passive Checks', '' ), self::CMD_START_ACCEPTING_PASSIVE_CHECKS => array( - 'Start accepting passive check for this %s', - 'Start passive checks', + 'Start Accepting Passive Checks For This %s', + 'Start Passive Checks', '' ), self::CMD_DISABLE_NOTIFICATIONS => array( - 'Disable notifications for this %s', - 'Disable notifications', + 'Disable Notifications For This %s', + 'Disable Notifications', '' ), self::CMD_ENABLE_NOTIFICATIONS => array( - 'Enable notifications for this %s', - 'Enable notifications', + 'Enable Notifications For This %s', + 'Enable Notifications', '' ), self::CMD_SEND_CUSTOM_NOTIFICATION => array( - 'Send custom %s notification', - 'Send notification', + 'Send Custom %s Notification', + 'Send Notification', '' ), self::CMD_SCHEDULE_DOWNTIME => array( - 'Schedule downtime for this %s', - 'Schedule downtime', + 'Schedule Downtime For This %s', + 'Schedule Downtime', '' ), self::CMD_SCHEDULE_DOWNTIMES_TO_ALL => array( - 'Schedule downtime for this %s and all services', - 'Schedule services downtime', + 'Schedule Downtime For This %s And All Services', + 'Schedule Services Downtime', '' ), self::CMD_REMOVE_DOWNTIMES_FROM_ALL => array( - 'Remove downtime(s) for this %s and all services', - 'Remove downtime(s)', + 'Remove Downtime(s) For This %s And All Services', + 'Remove Downtime(s)', '' ), self::CMD_DISABLE_NOTIFICATIONS_FOR_ALL => array( - 'Disable notification for all service on this %s', - 'Disable service notifications', + 'Disable Notification For All Service On This %s', + 'Disable Service Notifications', '' ), self::CMD_ENABLE_NOTIFICATIONS_FOR_ALL => array( - 'Enable notification for all service on this %s', - 'Enable service notifications', + 'Enable Notification For All Service On This %s', + 'Enable Service Notifications', '' ), self::CMD_RESCHEDULE_NEXT_CHECK_TO_ALL => array( - 'Schedule a check of all service on this %s', - 'Recheck all services', + 'Schedule a Check Of All Service On This %s', + 'Recheck All Services', '', 'btn-success' ), self::CMD_DISABLE_ACTIVE_CHECKS_FOR_ALL => array( - 'Disable checks for all services on this %s', - 'Disable service checks', + 'Disable Checks For All Services On This %s', + 'Disable Service Checks', '' ), self::CMD_ENABLE_ACTIVE_CHECKS_FOR_ALL => array( - 'Enable checks for all services on this %s', - 'Enable service checks', + 'Enable Checks For All Services On This %s', + 'Enable Service Checks', '' ), self::CMD_DISABLE_EVENT_HANDLER => array( - 'Disable event handler for this %s', - 'Disable event handler', + 'Disable Event Handler For This %s', + 'Disable Event Handler', '' ), self::CMD_ENABLE_EVENT_HANDLER => array( - 'Enable event handler for this %s', - 'Enable event handler', + 'Enable Event Handler For This %s', + 'Enable Event Handler', '' ), self::CMD_DISABLE_FLAP_DETECTION => array( - 'Disable flap detection for this %s', - 'Disable flap detection', + 'Disable Flap Detection For This %s', + 'Disable Flap Detection', '' ), self::CMD_ENABLE_FLAP_DETECTION => array( - 'Enable flap detection for this %s', - 'Enable flap detection', + 'Enable Flap Detection For This %s', + 'Enable Flap Detection', '' ), self::CMD_ADD_COMMENT => array( - 'Add new %s comment', - 'Add comment', + 'Add New %s Comment', + 'Add Comment', '' ), self::CMD_RESET_ATTRIBUTES => array( - 'Reset modified attributes', - 'Reset attributes', + 'Reset Modified Attributes', + 'Reset Attributes', '', 'btn-danger' ), self::CMD_ACKNOWLEDGE_PROBLEM => array( - 'Acknowledge %s problem', + 'Acknowledge %s Problem', 'Acknowledge', '', 'btn-warning' ), self::CMD_REMOVE_ACKNOWLEDGEMENT => array( - 'Remove %s acknowledgement', - 'Remove acknowledgement', + 'Remove %s Acknowledgement', + 'Remove Acknowledgement', '', 'btn-warning' ), self::CMD_DELAY_NOTIFICATION => array( - 'Delay next %s notification', - 'Delay notification', + 'Delay Next %s Notification', + 'Delay Notification', '' ), ); @@ -778,6 +778,7 @@ class Meta private function buildInterfaceConfiguration(array $commands, $objectType) { $out = array(); + $objectType = ucfirst($objectType); foreach ($commands as $index => $commandId) { $command = new \stdClass(); diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php index 6b5173d07..dbb12ba59 100644 --- a/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php +++ b/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php @@ -71,7 +71,7 @@ class MonitoringCommandsTest extends \PHPUnit_Framework_TestCase { $html = $helper->monitoringCommands($object, Meta::TYPE_SMALL); - $this->assertContains('Remove acknowledgement', $html); + $this->assertContains('Remove Acknowledgement', $html); $this->assertContains('Recheck', $html); $this->assertNotContains('Obsess', $html); $this->assertNotContains('Enable', $html); diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php index a9153787f..144139400 100644 --- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php +++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php @@ -25,12 +25,12 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase $this->assertCount(6, $returnArray); $expected = array( - 'Passive checks' => false, - 'Active checks' => false, + 'Passive Checks' => false, + 'Active Checks' => false, 'Obsessing' => true, 'Notifications' => false, - 'Event handler' => true, - 'Flap detection' => true + 'Event Handler' => true, + 'Flap Detection' => true ); $this->assertEquals($expected, $returnArray); @@ -53,12 +53,12 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase $this->assertCount(6, $returnArray); $expected = array( - 'Passive checks' => false, - 'Active checks' => true, + 'Passive Checks' => false, + 'Active Checks' => true, 'Obsessing' => false, 'Notifications' => true, - 'Event handler' => true, - 'Flap detection' => false + 'Event Handler' => true, + 'Flap Detection' => false ); $this->assertEquals($expected, $returnArray); @@ -79,12 +79,12 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase $this->assertCount(6, $returnArray); $expected = array( - 'Passive checks' => false, - 'Active checks' => true, + 'Passive Checks' => false, + 'Active Checks' => true, 'Obsessing' => true, 'Notifications' => false, - 'Event handler' => false, - 'Flap detection' => false + 'Event Handler' => false, + 'Flap Detection' => false ); $this->assertEquals($expected, $returnArray); @@ -103,12 +103,12 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase $this->assertCount(6, $returnArray); $expected = array( - 'Passive checks' => false, - 'Active checks' => false, + 'Passive Checks' => false, + 'Active Checks' => false, 'Obsessing' => false, 'Notifications' => false, - 'Event handler' => false, - 'Flap detection' => false + 'Event Handler' => false, + 'Flap Detection' => false ); $this->assertEquals($expected, $returnArray);