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

ActionController: Allow to control which inline view script to use 

This also affects that rerendering the layout does only have any effect
in case of XHR requests and is not overwritten anymore in this case.
Since this property was previously private, this should not break anything.
This commit is contained in:
Johannes Meyer 2017-06-28 11:14:01 +02:00
parent 22223acf1d
commit f6166b3ab6
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/layouts/scripts/body.phtml
View File

@ -16,6 +16,8 @@ if ($this->layout()->autorefreshInterval) {
$refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
}
$inlineLayoutScript = $this->layout()->inlineLayout . '.phtml';
?>
<div id="header">
<div id="announcements" class="container">
@ -41,7 +43,7 @@ if ($this->layout()->autorefreshInterval) {
<?php endif ?>
<div id="main" role="main">
<div id="col1" class="container<?= $moduleClass ?>"<?php if ($moduleName): ?> data-icinga-module="<?= $moduleName ?>" <?php endif ?> data-icinga-url="<?= Url::fromRequest()->without('renderLayout'); ?>"<?= $refresh; ?> style="display: block">
<?= $this->render('inline.phtml') ?>
<?= $this->render($inlineLayoutScript) ?>
</div>
<div id="col2" class="container">
</div>

19
library/Icinga/Web/Controller/ActionController.php
View File

@ -73,7 +73,12 @@ class ActionController extends Zend_Controller_Action
protected $rerenderLayout = false;
protected $xhrLayout = 'inline';
/**
* The inline layout (inside columns) to use
*
* @var string
*/
protected $inlineLayout = 'inline';
/**
* The inner layout (inside the body) to use
@ -130,9 +135,7 @@ class ActionController extends Zend_Controller_Action
if ($request->getUrl()->shift('showCompact')) {
$this->view->compact = true;
}
if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
$this->xhrLayout = $this->innerLayout;
}
$this->rerenderLayout = $request->getUrl()->shift('renderLayout');
if ($request->getUrl()->shift('_disableLayout')) {
$this->_helper->layout()->disableLayout();
}
@ -404,7 +407,6 @@ class ActionController extends Zend_Controller_Action
protected function rerenderLayout()
{
$this->rerenderLayout = true;
$this->xhrLayout = 'layout';
return $this;
}
@ -462,6 +464,7 @@ class ActionController extends Zend_Controller_Action
$req = $this->getRequest();
$layout = $this->_helper->layout();
$layout->innerLayout = $this->innerLayout;
$layout->inlineLayout = $this->inlineLayout;
if ($user = $req->getUser()) {
if ((bool) $user->getPreferences()->getValue('icingaweb', 'show_benchmark', false)) {
@ -490,8 +493,6 @@ class ActionController extends Zend_Controller_Action
protected function postDispatchXhr()
{
$layout = $this->_helper->layout();
$layout->setLayout($this->xhrLayout);
$resp = $this->getResponse();
$notifications = Notification::getInstance();
@ -521,8 +522,12 @@ class ActionController extends Zend_Controller_Action
$resp->setHeader('X-Icinga-Title', rawurlencode(static::DEFAULT_TITLE), true);
}
$layout = $this->_helper->layout();
if ($this->rerenderLayout) {
$layout->setLayout($this->innerLayout);
$this->getResponse()->setHeader('X-Icinga-Container', 'layout', true);
} else {
$layout->setLayout($this->inlineLayout);
}
if ($this->autorefreshInterval !== null) {