tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Alexander Klimov 2014-07-15 18:00:52 +02:00
parent 4c415aac5c
commit 8086292b1b
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
$stateColumn = 'host_hard_state'; $stateColumn = 'host_hard_state';
$stateChangeColumn = 'host_last_hard_state_change'; $stateChangeColumn = 'host_last_hard_state_change';
} else { } else {
$stateType = 'soft';
$stateColumn = 'host_state'; $stateColumn = 'host_state';
$stateChangeColumn = 'host_last_state_change'; $stateChangeColumn = 'host_last_state_change';
$stateType = 'soft';
} }
$this->addTitleTab('hosts'); $this->addTitleTab('hosts');

7
modules/monitoring/application/views/scripts/list/contactgroups.phtml
View File

@ -10,9 +10,8 @@
if (count($groupData) === 0) { if (count($groupData) === 0) {
echo t('No contacts matching the filter'); echo t('No contacts matching the filter');
} }
?>
<?php foreach ($groupData as $groupName => $groupInfo): ?> foreach ($groupData as $groupName => $groupInfo): ?>
<div class="box contactgroup"> <div class="box contactgroup">
<h2><?= $groupInfo['alias']; ?></h2> <h2><?= $groupInfo['alias']; ?></h2>
<?php if ($groupInfo['alias'] !== $groupName): ?> <?php if ($groupInfo['alias'] !== $groupName): ?>
@ -31,8 +30,8 @@ if (count($groupData) === 0) {
<p> <p>
<?php if ($c->contact_email): ?> <?php if ($c->contact_email): ?>
<?= $c->contact_email; ?> <?= $c->contact_email; ?>
<?php endif ?> <?php endif;
<?php if ($c->contact_pager): ?> if ($c->contact_pager): ?>
<br /> <br />
<?= $c->contact_pager; ?> <?= $c->contact_pager; ?>
<?php endif ?> <?php endif ?>

17
modules/monitoring/application/views/scripts/list/contacts.phtml
View File

@ -10,7 +10,7 @@ $contactHelper = $this->getHelper('ContactFlags');
<?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
</div> </div>
<div class="content contacts"> <div data-base-target="_next" class="content contacts">
<?php <?php
if (count($contacts) === 0) { if (count($contacts) === 0) {
echo t('No contacts matching the filter'); echo t('No contacts matching the filter');
@ -20,14 +20,17 @@ $contactHelper = $this->getHelper('ContactFlags');
<div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;"> <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
<img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" /> style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
<strong><?= $contact->contact_name ?></strong> (<?= $contact->contact_alias ?>) <a href="<?= $this->href(
'monitoring/show/contact',
array('contact' => $contact->contact_name)
) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
<?php <?php
foreach (array( foreach (array(
$contact->contact_email => 'eMail: <a href="mailto:%1$s">%1$s</a>', 'eMail: <a href="mailto:%1$s">%1$s</a>' => $contact->contact_email,
$contact->contact_pager => 'Pager: %s', 'Pager: %s' => $contact->contact_pager,
$contact->contact_notify_service_timeperiod => 'Service notification period: %s', 'Service notification period: %s' => $contact->contact_notify_service_timeperiod,
$contact->contact_notify_host_timeperiod => 'Host notification period: %s' 'Host notification period: %s' => $contact->contact_notify_host_timeperiod
) as $value => $format): ) as $format => $value):
if ($value): ?> if ($value): ?>
<br /> <br />
<?php <?php

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

@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<div style="margin: 1em"> <div style="margin: 1em">
<?= $this->sortControl->render($this); ?> <?= $this->sortControl->render($this); ?>
</div> </div>
<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
</div> </div>
<div class="content downtimes"> <div class="content downtimes">
@ -16,8 +16,7 @@ $helper = $this->getHelper('CommandForm');
if (count($downtimes) === 0) { if (count($downtimes) === 0) {
echo t('No downtimes matching the filter'); echo t('No downtimes matching the filter');
} }
?> foreach ($this->downtimes as $downtime): ?>
<?php foreach ($this->downtimes as $downtime): ?>
<tr> <tr>
<td> <td>
<?= $this->dateFormat()->formatDateTime($downtime->start); ?> - <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -