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

Remove filter boxes from monitoring' list views since they're not working 

refs #4583
This commit is contained in:
Eric Lippmann 2013-08-20 12:18:51 +02:00 committed by Marius Hein
parent ad84e9e9cf
commit ff1ed128ef
5 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/application/views/scripts/list/downtimes.phtml
View File

@ -41,7 +41,6 @@ $downtimes = $downtimes->fetchAll();
'downtime_duration' => 'Duration',
)
) ?>
<input type="search" name="filter" placeholder="Type to filter" />
<button class="btn btn-small"><i class="icon-refresh"></i></button>
</form>
<?=

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

@ -20,7 +20,6 @@ $trimArea = $this->getHelper('Trim');
'host_name' => 'Host',
)
) ?>
<input type="search" name="filter" placeholder="Type to filter" />
<button class="btn btn-small"><i class="icon-refresh"></i></button>
</form>
<?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
@ -45,14 +44,14 @@ $trimArea = $this->getHelper('Trim');
<?php endif; ?>
<?php $trimArea->end(); ?></div>
</td>
<td class="icons indicator">
<td class="icons indicator">
<div class="icon-box"><?php $trimArea->start(); ?>
<?php if (!$host->host_handled && $host->host_state > 0): ?>
<a href="#" title="<?= 'Unhandled host' ?>">
<i class="icon-warning-sign"></i>
</a>
<?php endif; ?>
<?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
<?php endif; ?>
<?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
<a href="#" title="<?= 'Acknowledged' ?>">
<i class="icon-ok-sign"></i>
</a>
@ -61,7 +60,7 @@ $trimArea = $this->getHelper('Trim');
<a href="#" title="<?= 'Flapping' ?>">
<i class="icon-random"></i>
</a>
<?php endif; ?>
<?php endif; ?>
<?php if (!$host->host_notifications_enabled): ?>
<a href="#" title="<?= 'Notifications disabled' ?>">
<i class="icon-volume-off"></i>
@ -72,7 +71,7 @@ $trimArea = $this->getHelper('Trim');
<i class="icon-wrench"></i>
</a>
<?php endif; ?>
<?php $trimArea->end(); ?></div>
<?php $trimArea->end(); ?></div>
</td>
<td class="indicator state" title="<?= $viewHelper->getStateTitle($host, 'host'); ?>">
<div class="statetext">
@ -92,7 +91,7 @@ $trimArea = $this->getHelper('Trim');
<?php endif; ?>
</div>
</td>
<td class="hostname">
<?php if ($host->host_last_comment !== null): ?>
<a href="#" title="<?= 'Comments' ?>">

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

@ -22,8 +22,7 @@ $formatter = $this->getHelper('MonitoringProperties');
'notification_start_time' => 'Time'
)
);
?>
<input type="search" name="filter" placeholder="Type to filter" />
?>
<button class="btn btn-small"><i class="icon-refresh"></i></button>
</form>
@ -89,4 +88,4 @@ echo $this->paginationControl($notifications, null, null, array('preserve' => $t
</tr>
<?php endforeach; ?>
</tbody>
</table>
</table>

33
modules/monitoring/application/views/scripts/list/services-compact.phtml
View File

@ -11,29 +11,6 @@ $trimArea = $this->getHelper('Trim');
</div>
<?php return; endif ?>
<form method="get" action="<?= $this->qUrl(
'monitoring/list/services?' . http_build_query($this->services->getAppliedFilter()->toParams()),
array()
);
?>">
Sort by <?= $this->formSelect(
'sort',
$this->sort,
array('class' => 'autosubmit'),
array(
'service_severity' => 'Severity',
'service_last_state_change' => 'Last state change',
'service_last_time_unknown' => 'Last UNKNOWN',
'service_last_time_critical' => 'Last CRITICAL',
'service_last_time_warning' => 'Last WARNING',
'service_last_time_ok' => 'Last OK',
'service_description' => 'Service',
)
) ?>
<input type="search" name="filter" placeholder="Type to filter" />
<button class="btn btn-small"><i class="icon-refresh"></i></button>
</form>
<?= $this->paginationControl($paginator, null, null, array('preserve' => $this->preserve)) ?>
<table class="statustable action services">
@ -56,14 +33,14 @@ $trimArea = $this->getHelper('Trim');
<?php endif; ?>
<?php $trimArea->end(); ?></div>
</td>
<td class="icons indicator">
<td class="icons indicator">
<div class="icon-box"><?php $trimArea->start(); ?>
<?php if (!$service->service_handled && $service->service_state > 0): ?>
<a href="#" title="<?= 'Unhandled service' ?>">
<i class="icon-warning-sign"></i>
</a>
<?php endif; ?>
<?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
<?php endif; ?>
<?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
<a href="#" title="<?= 'Acknowledged' ?>">
<i class="icon-ok-sign"></i>
</a>
@ -72,7 +49,7 @@ $trimArea = $this->getHelper('Trim');
<a href="#" title="<?= 'Flapping' ?>">
<i class="icon-random"></i>
</a>
<?php endif; ?>
<?php endif; ?>
<?php if (!$service->service_notifications_enabled): ?>
<a href="#" title="<?= 'Notifications disabled' ?>">
<i class="icon-volume-off"></i>
@ -83,7 +60,7 @@ $trimArea = $this->getHelper('Trim');
<i class="icon-wrench"></i>
</a>
<?php endif; ?>
<?php $trimArea->end(); ?></div>
<?php $trimArea->end(); ?></div>
</td>

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

@ -33,7 +33,6 @@ $trimArea = $this->getHelper('Trim');
'service_description' => 'Service',
)
) ?>
<input type="search" name="filter" placeholder="Type to filter" />
<button class="btn btn-small"><i class="icon-refresh"></i></button>
</form>
<?= $this->paginationControl($paginator, null, null, array('preserve' => $this->preserve)) ?>
@ -59,14 +58,14 @@ $trimArea = $this->getHelper('Trim');
<?php endif; ?>
<?php $trimArea->end(); ?></div>
</td>
<td class="icons indicator">
<td class="icons indicator">
<div class="icon-box"><?php $trimArea->start(); ?>
<?php if (!$service->service_handled && $service->service_state > 0): ?>
<a href="#" title="<?= 'Unhandled service' ?>">
<i class="icon-warning-sign"></i>
</a>
<?php endif; ?>
<?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
<?php endif; ?>
<?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
<a href="#" title="<?= 'Acknowledged' ?>">
<i class="icon-ok-sign"></i>
</a>
@ -75,7 +74,7 @@ $trimArea = $this->getHelper('Trim');
<a href="#" title="<?= 'Flapping' ?>">
<i class="icon-random"></i>
</a>
<?php endif; ?>
<?php endif; ?>
<?php if (!$service->service_notifications_enabled): ?>
<a href="#" title="<?= 'Notifications disabled' ?>">
<i class="icon-volume-off"></i>
@ -86,7 +85,7 @@ $trimArea = $this->getHelper('Trim');
<i class="icon-wrench"></i>
</a>
<?php endif; ?>
<?php $trimArea->end(); ?></div>
<?php $trimArea->end(); ?></div>
</td>