[icinga-checkins] icinga.org: icingaweb2/master: Integrate the iframe module into the framework

git at icinga.org git at icinga.org
Tue Feb 9 13:58:45 CET 2016


Module: icingaweb2
Branch: master
Commit: 7fe71f7472e2b34e989d40c611d4c8769f5eb29f
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=7fe71f7472e2b34e989d40c611d4c8769f5eb29f

Author: Alexander A. Klimov <alexander.klimov at netways.de>
Date:   Tue Feb  9 13:37:53 2016 +0100

Integrate the iframe module into the framework

refs #10881

---

 .../controllers/IframeController.php                               |    4 ++--
 .../scripts/index => application/views/scripts/iframe}/index.phtml |    0
 modules/iframe/module.info                                         |    3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

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 7e9ddf6..8aebba4 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 e774a56..0000000
--- 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



More information about the icinga-checkins mailing list