tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PDF output wherever it works, disable dead filter control

This commit is contained in:
Thomas Gelf 2014-03-10 01:24:45 +01:00
parent 84876059f5
commit 448d7c1a8d
6 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/application/controllers/ListController.php
View File

@ -520,8 +520,14 @@ class Monitoring_ListController extends Controller
private function createTabs() private function createTabs()
{ {
$tabs = $this->getTabs(); $tabs = $this->getTabs();
$tabs->extend(new OutputFormat()) if (in_array($this->_request->getActionName(), array(
->extend(new DashboardAction()); 'hosts',
'services',
'eventhistory',
'notifications'
))) {
$tabs->extend(new OutputFormat())->extend(new DashboardAction());
}
} }
} }
// @codingStandardsIgnoreEnd // @codingStandardsIgnoreEnd

6
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -1,8 +1,8 @@
<div class="controls"> <div class="controls">
<?= $this->tabs->render($this); ?> <?= $this->tabs->render($this); ?>
<div style="margin: 1em"> <div style="margin: 1em" class="dontprint">
<?= $this->filterBox->render($this); ?> <!--<?= $this->filterBox->render($this); ?>-->
<?= $this->sortControl->render($this); ?> Sort by <?= $this->sortControl->render($this); ?>
<!--<?= $this->selectionToolbar('single'); ?>--> <!--<?= $this->selectionToolbar('single'); ?>-->
</div> </div>
<?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>

6
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -3,12 +3,12 @@ $helper = $this->getHelper('MonitoringState');
?> ?>
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<div style="margin: 1em;"> <div style="margin: 1em;" class="dontprint">
<?= $this->filterBox ?> <?= $this->sortControl->render($this); ?> <!--<?= $this->filterBox ?>-->Sort by <?= $this->sortControl->render($this); ?>
</div> </div>
<!--<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/host',array( 'host' => '*' ))); ?>--> <!--<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/host',array( 'host' => '*' ))); ?>-->
<div style="margin: 1em;">
<?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?>
</div> </div>
<div class="content"> <div class="content">
<?php <?php

4
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<div style="margin: 1em"> <div style="margin: 1em" class="dontprint">
<?= $this->sortControl->render($this) ?> Sort by <?= $this->sortControl->render($this) ?>
<!--<?= $this->selectionToolbar('single') ?>--> <!--<?= $this->selectionToolbar('single') ?>-->
</div> </div>
<?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?> <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>

8
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -4,14 +4,12 @@ $helper = $this->getHelper('MonitoringState');
if (!$this->compact): ?> if (!$this->compact): ?>
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<div style="margin: 1em;"> <div style="margin: 1em;" class="dontprint">
<?= $this->filterBox ?> <!-- <?= $this->filterBox ?>-->
<?= $this->sortControl ?> Sort by <?= $this->sortControl ?>
</div> </div>
<div style="margin: 1em;">
<?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)); ?>
</div> </div>
</div>
<div class="content"> <div class="content">
<?php endif ?> <?php endif ?>

4
public/css/pdf/pdfprint.less
View File

@ -1,5 +1,5 @@
.controls, .dontprint, .inlinepie { .controls form, .controls .pagination, .controls > .tabs, .dontprint, .inlinepie {
display: none; display: none !important;
} }
@page { @page {