Eric Lippmann
commit
d39a41ebc6
|
|
@ -70,8 +70,8 @@ class RemoveAcknowledgementCommandForm extends ObjectsCommandForm
|
|||
'ignore' => true,
|
||||
'label' => $this->getSubmitLabel(),
|
||||
'title' => $this->translatePlural(
|
||||
'Remove problem acknowledgement',
|
||||
'Remove problem acknowledgements',
|
||||
'Remove acknowledgement',
|
||||
'Remove acknowledgements',
|
||||
count($this->objects)
|
||||
),
|
||||
'type' => 'submit'
|
||||
|
|
@ -89,8 +89,8 @@ class RemoveAcknowledgementCommandForm extends ObjectsCommandForm
|
|||
$label = $this->getView()->icon('cancel');
|
||||
if ($this->isLabelEnabled()) {
|
||||
$label .= $this->translatePlural(
|
||||
'Remove problem acknowledgement',
|
||||
'Remove problem acknowledgements',
|
||||
'Remove acknowledgement',
|
||||
'Remove acknowledgements',
|
||||
count($this->objects)
|
||||
);
|
||||
}
|
||||
|
|
@ -111,8 +111,8 @@ class RemoveAcknowledgementCommandForm extends ObjectsCommandForm
|
|||
}
|
||||
Notification::success(mtp(
|
||||
'monitoring',
|
||||
'Removing problem acknowledgement..',
|
||||
'Removing problem acknowledgements..',
|
||||
'Removing acknowledgement..',
|
||||
'Removing acknowledgements..',
|
||||
count($this->objects)
|
||||
));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
<?php use Icinga\Data\Filter\Filter; ?>
|
||||
|
||||
<div class="controls separated">
|
||||
<div class="controls">
|
||||
<?php if (! $this->compact): ?>
|
||||
<?= $this->tabs ?>
|
||||
<?php endif ?>
|
||||
<?= $this->render('partials/object/host-header.phtml') ?>
|
||||
<?php
|
||||
<?php
|
||||
$this->stats = $object->stats;
|
||||
$this->baseFilter = Filter::where('host', $object->host_name);
|
||||
echo $this->render('list/components/servicesummary.phtml');
|
||||
?>
|
||||
?>
|
||||
<?= $this->render('partials/object/quick-actions.phtml') ?>
|
||||
</div>
|
||||
|
||||
<?= $this->render('partials/object/detail-content.phtml') ?>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,142 @@
|
|||
<div class="quick-actions">
|
||||
<ul class="nav tab-nav">
|
||||
<?php if (isset($removeAckForm)): ?>
|
||||
<li>
|
||||
<?php
|
||||
$removeAckForm = clone $removeAckForm;
|
||||
$removeAckForm->setLabelEnabled(true);
|
||||
echo $removeAckForm;
|
||||
?>
|
||||
</li>
|
||||
<?php elseif /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ ($this->hasPermission('monitoring/command/acknowledge-problem') && ! (in_array((int) $object->state, array(0, 99))) ): ?>
|
||||
<li>
|
||||
<?php if ($object->getType() === $object::TYPE_HOST) {
|
||||
echo $this->qlink(
|
||||
$this->translate('Acknowledge'),
|
||||
'monitoring/host/acknowledge-problem',
|
||||
array('host' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'ok',
|
||||
'title' => $this->translate(
|
||||
'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
|
||||
)
|
||||
)
|
||||
);
|
||||
} else {
|
||||
echo $this->qlink(
|
||||
$this->translate('Acknowledge'),
|
||||
'monitoring/service/acknowledge-problem',
|
||||
array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'ok',
|
||||
'title' => $this->translate(
|
||||
'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
|
||||
)
|
||||
)
|
||||
);
|
||||
} ?>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<?php if (isset($checkNowForm)): // Form is unset if the current user lacks the respective permission ?>
|
||||
<li><?= $checkNowForm ?></li>
|
||||
<?php endif ?>
|
||||
<?php if ($this->hasPermission('monitoring/command/comment/add')): ?>
|
||||
<li>
|
||||
<?php if ($object->getType() === $object::TYPE_HOST) {
|
||||
echo $this->qlink(
|
||||
$this->translate('Comment'),
|
||||
'monitoring/host/add-comment',
|
||||
array('host' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'comment',
|
||||
'title' => $this->translate('Add a new comment to this host')
|
||||
)
|
||||
);
|
||||
} else {
|
||||
echo $this->qlink(
|
||||
$this->translate('Comment'),
|
||||
'monitoring/service/add-comment',
|
||||
array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'comment',
|
||||
'title' => $this->translate('Add a new comment to this service')
|
||||
)
|
||||
);
|
||||
} ?>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
|
||||
<li>
|
||||
<?php if ($object->getType() === $object::TYPE_HOST) {
|
||||
echo $this->qlink(
|
||||
$this->translate('Notification'),
|
||||
'monitoring/host/send-custom-notification',
|
||||
array('host' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'bell-alt',
|
||||
'title' => $this->translate(
|
||||
'Send a custom notification to contacts responsible for this host'
|
||||
)
|
||||
)
|
||||
);
|
||||
} else {
|
||||
echo $this->qlink(
|
||||
$this->translate('Notification'),
|
||||
'monitoring/service/send-custom-notification',
|
||||
array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'bell-alt',
|
||||
'title' => $this->translate(
|
||||
'Send a custom notification to contacts responsible for this service'
|
||||
)
|
||||
)
|
||||
);
|
||||
} ?>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<?php if ($this->hasPermission('monitoring/command/downtime/schedule')): ?>
|
||||
<li><?php if ($object->getType() === $object::TYPE_HOST) {
|
||||
echo $this->qlink(
|
||||
$this->translate('Downtime'),
|
||||
'monitoring/host/schedule-downtime',
|
||||
array('host' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'plug',
|
||||
'title' => $this->translate(
|
||||
'Schedule a downtime to suppress all problem notifications within a specific period of time'
|
||||
)
|
||||
)
|
||||
);
|
||||
} else {
|
||||
echo $this->qlink(
|
||||
$this->translate('Downtime'),
|
||||
'monitoring/service/schedule-downtime',
|
||||
array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
'data-base-target' => '_self',
|
||||
'icon' => 'plug',
|
||||
'title' => $this->translate(
|
||||
'Schedule a downtime to suppress all problem notifications within a specific period of time'
|
||||
)
|
||||
)
|
||||
);
|
||||
} ?>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<div class="controls separated">
|
||||
<div class="controls">
|
||||
<?php if (! $this->compact): ?>
|
||||
<?= $this->tabs ?>
|
||||
<?php endif ?>
|
||||
<?= $this->render('partials/object/service-header.phtml') ?>
|
||||
<?= $this->render('partials/object/quick-actions.phtml') ?>
|
||||
</div>
|
||||
|
||||
<?= $this->render('partials/object/detail-content.phtml') ?>
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@
|
|||
// Host and service summaries in detail and list views
|
||||
.hosts-summary,
|
||||
.services-summary {
|
||||
display: inline-block;
|
||||
margin-bottom: 0.5em;
|
||||
|
||||
> .hosts-link,
|
||||
|
|
@ -113,11 +114,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.controls > .hosts-summary,
|
||||
.controls > .services-summary {
|
||||
float: left;
|
||||
}
|
||||
|
||||
// State table in the host and service multi-selection and detail views
|
||||
.host-detail-state,
|
||||
.service-detail-state {
|
||||
|
|
@ -131,6 +127,31 @@
|
|||
}
|
||||
}
|
||||
|
||||
// Quick actions
|
||||
.quick-actions {
|
||||
ul {
|
||||
// Center horizontally
|
||||
display: table;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
li {
|
||||
border-right: 1px solid fade(@icinga-blue, 50%);
|
||||
color: @icinga-blue;
|
||||
padding: 0 0.6em;
|
||||
}
|
||||
|
||||
li:last-child {
|
||||
border-right: none;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
li i {
|
||||
font-size: 1.2em;
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
|
||||
/* Generic box element */
|
||||
|
||||
.boxview > div.box {
|
||||
|
|
|
|||
Loading…
Reference in New Issue