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/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
parent 34afcc07b3 8958873e77
commit 1abd1d28bc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/iframe/application/controllers/IndexController.php → application/controllers/IframeController.php
View File

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

4
application/views/scripts/iframe/index.phtml Normal file
View File

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

1
modules/iframe/application/views/scripts/index/index.phtml
View File

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

3
modules/iframe/module.info
View File

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