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

monitoring: Remove h1 from service/show and feature command forms 

refs #5543
This commit is contained in:
Eric Lippmann 2015-10-01 22:53:42 +02:00
parent aadbbe08e1
commit 3a27e44437
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
View File

@ -63,7 +63,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
if ((bool) $this->status->notifications_enabled) { if ((bool) $this->status->notifications_enabled) {
if ($this->hasPermission('monitoring/command/feature/instance')) { if ($this->hasPermission('monitoring/command/feature/instance')) {
$notificationDescription = sprintf( $notificationDescription = sprintf(
'<a aria-label="%1$s" title="%1$s" href="%2$s" data-base-target="_next">%3$s</a>', '<a aria-label="%1$s" class="action-link" title="%1$s" href="%2$s" data-base-target="_next">%3$s</a>',
$this->translate('Disable notifications for a specific time on a program-wide basis'), $this->translate('Disable notifications for a specific time on a program-wide basis'),
$this->getView()->href('monitoring/health/disable-notifications'), $this->getView()->href('monitoring/health/disable-notifications'),
$this->translate('Disable temporarily') $this->translate('Disable temporarily')
@ -126,14 +126,15 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'description' => $notificationDescription, 'description' => $notificationDescription,
'decorators' => array( 'decorators' => array(
'ViewHelper', array('Label', array('tag'=>'span', 'separator' => '', 'class' => 'control-label')),
'Errors',
array( array(
'Description', 'Description',
array('tag' => 'span', 'class' => 'description', 'escape' => false) array('tag' => 'span', 'class' => 'description', 'escape' => false)
), ),
'Label', array(array('labelWrap' => 'HtmlTag'), array('tag' => 'div', 'class' => 'control-label-group')),
array('HtmlTag', array('tag' => 'div')) array('ViewHelper', array('separator' => '')),
array('Errors', array('separator' => '')),
array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
), ),
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )

2
modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
View File

@ -19,9 +19,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
public function init() public function init()
{ {
$this->setUseFormAutosubmit(); $this->setUseFormAutosubmit();
$this->setTitle('Feature Commands');
$this->setAttrib('class', 'inline object-features'); $this->setAttrib('class', 'inline object-features');
$this->loadDefaultDecorators()->getDecorator('description')->setTag('h2');
} }
/** /**

2
modules/monitoring/application/views/scripts/host/show.phtml
View File

@ -2,7 +2,7 @@
<div class="controls separated"> <div class="controls separated">
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->tabs; ?> <?= $this->tabs ?>
<?php endif ?> <?php endif ?>
<?= $this->render('partials/object/host-header.phtml') ?> <?= $this->render('partials/object/host-header.phtml') ?>
<?php <?php

1
modules/monitoring/application/views/scripts/service/show.phtml
View File

@ -3,7 +3,6 @@
<?= $this->tabs ?> <?= $this->tabs ?>
<?php endif ?> <?php endif ?>
<?= $this->render('partials/object/service-header.phtml') ?> <?= $this->render('partials/object/service-header.phtml') ?>
<h1><?= $this->translate('Service detail information') ?></h1>
</div> </div>
<?= $this->render('partials/object/detail-content.phtml') ?> <?= $this->render('partials/object/detail-content.phtml') ?>