diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 9d0738129..a6b5da9b3 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -520,8 +520,14 @@ class Monitoring_ListController extends Controller private function createTabs() { $tabs = $this->getTabs(); - $tabs->extend(new OutputFormat()) - ->extend(new DashboardAction()); + if (in_array($this->_request->getActionName(), array( + 'hosts', + 'services', + 'eventhistory', + 'notifications' + ))) { + $tabs->extend(new OutputFormat())->extend(new DashboardAction()); + } } } // @codingStandardsIgnoreEnd diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index 62db25aee..6a753a4f8 100644 --- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml +++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml @@ -1,8 +1,8 @@
tabs->render($this); ?> -
-filterBox->render($this); ?> -sortControl->render($this); ?> +
+ +Sort by sortControl->render($this); ?>
paginationControl($history, null, null, array('preserve' => $this->preserve)); ?> diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 432560bb2..0cb09b55e 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -3,12 +3,12 @@ $helper = $this->getHelper('MonitoringState'); ?>
tabs ?> -
-filterBox ?> sortControl->render($this); ?> +
+Sort by sortControl->render($this); ?>
-
paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?> +
tabs ?> -
-sortControl->render($this) ?> +
+Sort by sortControl->render($this) ?>
paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 37d8f4c27..e09444b55 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -4,14 +4,12 @@ $helper = $this->getHelper('MonitoringState'); if (!$this->compact): ?>
tabs ?> -
-filterBox ?> -sortControl ?> +
+ +Sort by sortControl ?>
-
paginationControl($services, null, null, array('preserve' => $this->preserve)); ?>
-
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less index 742dcd491..2f57380a3 100644 --- a/public/css/pdf/pdfprint.less +++ b/public/css/pdf/pdfprint.less @@ -1,5 +1,5 @@ -.controls, .dontprint, .inlinepie { - display: none; +.controls form, .controls .pagination, .controls > .tabs, .dontprint, .inlinepie { + display: none !important; } @page {