data-icinga-module="" data-icinga-url="" style="display: block"> render('inline.phtml') ?> diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 2d78e4280..4cc47d69a 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -13,7 +13,7 @@ if (array_key_exists('_dev', $_GET)) { $ie8jsfile = 'js/icinga.ie8.js'; $lang = Translator::getLanguage(); -$isIframe = isset($_GET['isIframe']); +$isIframe = $this->layout()->isIframe; $iframeClass = $isIframe ? ' iframe' : ''; ?> @@ -30,15 +30,16 @@ $iframeClass = $isIframe ? ' iframe' : ''; + + + - - - + @@ -61,5 +63,6 @@ var icinga = new Icinga({ baseUrl: 'href('/') ?>' }); + diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index c5f44029e..e3814599d 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -109,7 +109,7 @@ class ActionController extends Zend_Controller_Action $this->handlerBrowserWindows(); $this->view->translationDomain = 'icinga'; - + $this->_helper->layout()->isIframe = (bool) $this->params->shift('isIframe', false); if ($this->requiresConfig()) { $this->redirectNow(Url::fromPath('install')); } diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index b21eeae36..d8ac6ab50 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -442,7 +442,6 @@ class Monitoring_ListController extends Controller $params = clone $this->params; $params->shift('_render'); - $params->shift('isIframe'); $limit = $params->shift('limit'); $sort = $params->shift('sort'); $dir = $params->shift('dir');