Merge branch 'bugfix/move-iframe-from-modules-to-framework-10881'

fixes #10881
This commit is contained in:
Alexander A. Klimov 2016-02-09 13:58:07 +01:00
commit 1abd1d28bc
4 changed files with 6 additions and 6 deletions

View File

@ -1,14 +1,14 @@
<?php
/* Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Iframe\Controllers;
namespace Icinga\Controllers;
use Icinga\Web\Controller;
/**
* Display external or internal links within an iframe
*/
class IndexController extends Controller
class IframeController extends Controller
{
/**
* Display iframe w/ the given URL

View File

@ -0,0 +1,4 @@
<div class="controls">
<?= $tabs ?>
</div>
<iframe src="<?= $this->escape($url) ?>" style="height:99%; width:99%;" frameborder="no"></iframe>

View File

@ -1 +0,0 @@
<iframe src="<?= $this->escape($url) ?>" style="height:100%; width:99%;" frameborder="no"></iframe>

View File

@ -1,3 +0,0 @@
Module: iframe
Version: 2.1.2
Description: Display web sites within Icinga Web 2 via iframes