diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php index dc7feb2da..48ff64723 100644 --- a/modules/monitoring/application/controllers/ServicesController.php +++ b/modules/monitoring/application/controllers/ServicesController.php @@ -144,7 +144,7 @@ class Monitoring_ServicesController extends Controller $this->view->objectsInDowntime = $objectsInDowntime; $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes') ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString()); - $this->view->havingCommentsLink = Url::fromRequest() + $this->view->commentsLink = Url::fromRequest() ->setPath('monitoring/list/comments'); $this->view->serviceStatesPieChart = $this->createPieChart( $serviceStates, diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml index 522d32ce7..1cc895dd3 100644 --- a/modules/monitoring/application/views/scripts/services/show.phtml +++ b/modules/monitoring/application/views/scripts/services/show.phtml @@ -37,7 +37,7 @@
- + translate('List all') ?>
@@ -81,17 +81,43 @@ ) ?>
- + icon('plug') ?> - translate('Schedule downtimes for unhandled problem services') ?> + translatePlural( + 'Schedule downtime for unhandled service problem', + 'Schedule downtimes for unhandled service problems', + $unhandledCount + ), + $unhandledCount + ) ?>
- + icon('ok') ?> - translate('Acknowledge unhandled problem services') ?> + translatePlural( + 'Acknowledge unhandled service problem', + 'Acknowledge unhandled service problems', + $unhandledCount + ), + $unhandledCount + ) ?>
@@ -116,13 +142,18 @@

- + icon('plug') ?> translatePlural( - '%u service is in downtime', - '%u services are in downtime', + 'List %u service currently in downtime', + 'List %u services currently in downtime', $inDowntimeCount ), $inDowntimeCount @@ -131,19 +162,25 @@

- getComments()) ?> - + getComments()) ?> +

- + icon('comment') ?> translatePlural( - '%u comment', - '%u comments', - $havingCommentsCount + 'List %u service comment', + 'List %u service comments', + $commentCount ), - $havingCommentsCount + $commentCount ) ?>