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

Merge branch 'master' into bugfix/ie8-fixes-6417

This commit is contained in:
Marius Hein 2015-01-28 17:08:56 +01:00
parent 9d05190517 f486dabe6d
commit 4abb30e55b
18 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/scripts/config/authentication/reorder.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_main">
<?= $tabs; ?>
</div>
<div class="content" data-base-target="_next">

2
application/views/scripts/config/index.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_main">
<?= $this->tabs->render($this); ?>
</div>

35
application/views/scripts/config/logging.phtml
View File

@ -1,35 +0,0 @@
<div class="controls">
<?= $this->tabs->render($this); ?>
</div>
<div class="content">
<?php $errors = $this->form->getErrorMessages(); ?>
<?php if (isset($this->messageBox)): ?>
<?= $this->messageBox->render() ?>
<?php endif ?>
<?php if ($this->successMessage): ?>
<div>
<i class="icinga-icon-success"></i>
<strong><?= $this->escape($this->successMessage); ?></strong>
</div>
<?php endif; ?>
<?php if (!empty($errors)) : ?>
<div>
<h4>Errors occured when trying to save the project.</h4>
<p>
The following errors occured when trying to save the configuration:
</p>
<ul>
<?php foreach($errors as $error): ?>
<li><?= $this->escape($error) ?></li>
<?php endforeach; ?>
</ul>
</div>
<?php endif; ?>
<?= $this->form ?>
</div>

2
application/views/scripts/config/module.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_right">
<?= $this->tabs ?>
<h1><?= $this->escape($module->getTitle()) ?></h1>
</div>

2
application/views/scripts/config/resource.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_main">
<?= $tabs; ?>
</div>
<div class="content" data-base-target="_next">

2
application/views/scripts/roles/index.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_main">
<?= $tabs ?>
<h1><?= $this->translate('Roles') ?></h1>
</div>

19
library/Icinga/Web/Widget/Tabs.php
View File

@ -218,6 +218,25 @@ EOT;
return $this;
}
/**
* Remove a tab
*
* @param string $name
*
* @return self
*/
public function remove($name)
{
if ($this->has($name)) {
unset($this->tabs[$name]);
if (($dropdownIndex = array_search($name, $this->dropdownTabs)) !== false) {
array_splice($this->dropdownTabs, $dropdownIndex, 2);
}
}
return $this;
}
/**
* Add a tab to the dropdown on the right side of the tab-bar.
*

8
modules/monitoring/application/controllers/HostController.php
View File

@ -34,15 +34,7 @@ class Monitoring_HostController extends MonitoredObjectController
}
$this->object = $host;
$this->createTabs();
}
/**
* Show a host
*/
public function showAction()
{
$this->getTabs()->activate('host');
parent::showAction();
}
/**

8
modules/monitoring/application/controllers/ServiceController.php
View File

@ -34,15 +34,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
}
$this->object = $service;
$this->createTabs();
}
/**
* Show a service
*/
public function showAction()
{
$this->getTabs()->activate('service');
parent::showAction();
}
/**

2
modules/monitoring/application/views/scripts/config/index.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_right">
<?= $tabs; ?>
<h1><?= $this->translate('Monitoring Backends') ?></h1>
</div>

2
modules/monitoring/application/views/scripts/config/security.phtml
View File

@ -1,4 +1,4 @@
<div class="controls">
<div class="controls" data-base-target="_right">
<?= $this->tabs ?>
</div>
<div class="content">

2
modules/monitoring/application/views/scripts/partials/command-form.phtml
View File

@ -1,5 +1,5 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
<?= $this->tabs->remove('dashboard') ?>
</div>
<div class="content">
<h1><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>

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

@ -35,7 +35,7 @@ if ($object->acknowledged): ?>
);
}
?>
<a href="<?= $ackLink ?>">
<a href="<?= $ackLink ?>" data-base-target="_self">
<?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
</a>
<?php } else {

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

@ -39,7 +39,7 @@ if ($object->getType() === $object::TYPE_HOST) {
);
}
?>
<a href="<?= $reschedule ?>">
<a href="<?= $reschedule ?>" data-base-target="_self">
<?= $this->icon('reschedule') ?>
<?= $this->translate('Reschedule') ?>
</a>

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

@ -21,7 +21,7 @@ $command = array_shift($parts);
array('host' => $object->getHost()->getName(), 'service' => $object->getName())
);
} ?>
<a href="<?= $processCheckResult ?>">
<a href="<?= $processCheckResult ?>" data-base-target="_self">
<?= $this->icon('reply') ?>
<?= $this->translate('Process check result') ?>
</a>

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

@ -15,7 +15,7 @@
);
}
?>
<a href="<?= $addCommentLink ?>">
<a href="<?= $addCommentLink ?>" data-base-target="_self">
<?= $this->icon('comment') ?>
<?= $this->translate('Add comment') ?>
</a>

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

@ -15,7 +15,7 @@
);
}
?>
<a href="<?= $scheduleDowntimeLink ?>">
<a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
<?= $this->icon('plug') ?>
<?= $this->translate('Schedule downtime') ?>
</a>

10
public/js/icinga/events.js
View File

@ -482,6 +482,16 @@
targetId = 'col1';
$target = $('#' + targetId);
self.icinga.ui.layout1col();
} else if (targetId === '_right') {
// Ensure that the content is displayed in the rightmost column
$target = $el.closest('.container');
if ($target.attr('id') === 'col1') {
// As it's not possible to detect what's preceding the current state in the
// history stack this just simulates _main in case the respective element
// is not part of the rightmost column
$target = $('#col1');
self.icinga.ui.layout1col();
}
} else {
$target = $('#' + targetId);
}