tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 09:14:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Params/_render: get rid of it, start with iframe

Browse Source
This commit is contained in:
Thomas Gelf 2014-06-22 16:18:23 +02:00
parent bb23d0636c
commit 3b84078b2f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/layouts/scripts/layout.phtml
View File

@ -13,7 +13,7 @@ if (array_key_exists('_dev', $_GET)) {
$ie8jsfile = 'js/icinga.ie8.js'; $ie8jsfile = 'js/icinga.ie8.js';
$lang = Translator::getLanguage(); $lang = Translator::getLanguage();
$isIframe = isset($_GET['_render']) && $_GET['_render'] === 'iframe'; $isIframe = isset($_GET['isIframe']);
$iframeClass = $isIframe ? ' iframe' : ''; $iframeClass = $isIframe ? ' iframe' : '';
?><!DOCTYPE html> ?><!DOCTYPE html>

2
library/Icinga/Web/Url.php
View File

@ -396,7 +396,7 @@ class Url
* *
* @return self * @return self
*/ */
public function setParam($param, $value) public function setParam($param, $value = true)
{ {
$this->params->set($param, $value); $this->params->set($param, $value);
return $this; return $this;

4
library/Icinga/Web/Widget/Dashboard/Component.php
View File

@ -165,9 +165,9 @@ EOD;
{ {
$view = $this->view(); $view = $this->view();
$url = clone($this->url); $url = clone($this->url);
$url->addParams(array('view' => 'compact')); $url->setParam('view', 'compact');
$iframeUrl = clone($url); $iframeUrl = clone($url);
$iframeUrl->addParams(array('_render' => 'iframe')); $iframeUrl->setParam('isIframe');
$html = str_replace('{URL}', $url, $this->template); $html = str_replace('{URL}', $url, $this->template);
$html = str_replace('{IFRAME_URL}', $iframeUrl, $html); $html = str_replace('{IFRAME_URL}', $iframeUrl, $html);

1
modules/monitoring/application/controllers/ListController.php
View File

@ -442,6 +442,7 @@ class Monitoring_ListController extends Controller
$params = clone $this->params; $params = clone $this->params;
$params->shift('_render'); $params->shift('_render');
$params->shift('isIframe');
$limit = $params->shift('limit'); $limit = $params->shift('limit');
$sort = $params->shift('sort'); $sort = $params->shift('sort');
$dir = $params->shift('dir'); $dir = $params->shift('dir');