From 7fe71f7472e2b34e989d40c611d4c8769f5eb29f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Feb 2016 13:37:53 +0100
Subject: [PATCH 1/3] Integrate the iframe module into the framework

refs #10881
---
 .../controllers/IframeController.php                          | 4 ++--
 .../index => application/views/scripts/iframe}/index.phtml    | 0
 modules/iframe/module.info                                    | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)
 rename modules/iframe/application/controllers/IndexController.php => application/controllers/IframeController.php (79%)
 rename {modules/iframe/application/views/scripts/index => application/views/scripts/iframe}/index.phtml (100%)
 delete mode 100644 modules/iframe/module.info

diff --git a/modules/iframe/application/controllers/IndexController.php b/application/controllers/IframeController.php
similarity index 79%
rename from modules/iframe/application/controllers/IndexController.php
rename to application/controllers/IframeController.php
index 7e9ddf648..8aebba4af 100644
--- a/modules/iframe/application/controllers/IndexController.php
+++ b/application/controllers/IframeController.php
@@ -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
diff --git a/modules/iframe/application/views/scripts/index/index.phtml b/application/views/scripts/iframe/index.phtml
similarity index 100%
rename from modules/iframe/application/views/scripts/index/index.phtml
rename to application/views/scripts/iframe/index.phtml
diff --git a/modules/iframe/module.info b/modules/iframe/module.info
deleted file mode 100644
index e774a56a1..000000000
--- a/modules/iframe/module.info
+++ /dev/null
@@ -1,3 +0,0 @@
-Module: iframe
-Version: 2.1.2
-Description: Display web sites within Icinga Web 2 via iframes

From 86834c49939eb284637f4e8ceb7364fb4dc7fa43 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Feb 2016 13:39:44 +0100
Subject: [PATCH 2/3] Add missing html structure to view script

refs #10881
---
 application/views/scripts/iframe/index.phtml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/views/scripts/iframe/index.phtml b/application/views/scripts/iframe/index.phtml
index cd5184009..2bd5afee3 100644
--- a/application/views/scripts/iframe/index.phtml
+++ b/application/views/scripts/iframe/index.phtml
@@ -1 +1,6 @@
-<iframe src="<?= $this->escape($url) ?>" style="height:100%; width:99%;" frameborder="no"></iframe>
+<div class="controls">
+    <?= $tabs ?>
+</div>
+<div class="content">
+    <iframe src="<?= $this->escape($url) ?>" style="height:100%; width:99%;" frameborder="no"></iframe>
+</div>

From 8958873e772b8e2d1f500127a7ee685b1af46c29 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Feb 2016 13:54:56 +0100
Subject: [PATCH 3/3] Change the height of iframes to 99%

refs #10881
---
 application/views/scripts/iframe/index.phtml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/views/scripts/iframe/index.phtml b/application/views/scripts/iframe/index.phtml
index 2bd5afee3..7f409d0f6 100644
--- a/application/views/scripts/iframe/index.phtml
+++ b/application/views/scripts/iframe/index.phtml
@@ -1,6 +1,4 @@
 <div class="controls">
     <?= $tabs ?>
 </div>
-<div class="content">
-    <iframe src="<?= $this->escape($url) ?>" style="height:100%; width:99%;" frameborder="no"></iframe>
-</div>
+<iframe src="<?= $this->escape($url) ?>" style="height:99%; width:99%;" frameborder="no"></iframe>
\ No newline at end of file