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

Merge branch 'bugfix/close-forms-when-switching-between-config-tabs-6436' 

fixes #6436
This commit is contained in:
Johannes Meyer 2015-01-28 14:21:46 +01:00
parent 9f9f6274de 618ab4f4b9
commit 352faa8b68
8 changed files with 17 additions and 7 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>

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>

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">

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);
}