From a8e28bfee4c9309178f1fca89edc84400a7eeb09 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 10 Nov 2014 16:43:37 +0100 Subject: [PATCH] Change route icingaweb/setup/setup to icingaweb/setup refs #7163 --- .../controllers/{SetupController.php => IndexController.php} | 4 ++-- .../application/views/scripts/{setup => index}/index.phtml | 4 ++-- .../views/scripts/{setup => index}/parts/finish.phtml | 0 .../views/scripts/{setup => index}/parts/wizard.phtml | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename modules/setup/application/controllers/{SetupController.php => IndexController.php} (89%) rename modules/setup/application/views/scripts/{setup => index}/index.phtml (98%) rename modules/setup/application/views/scripts/{setup => index}/parts/finish.phtml (100%) rename modules/setup/application/views/scripts/{setup => index}/parts/wizard.phtml (100%) diff --git a/modules/setup/application/controllers/SetupController.php b/modules/setup/application/controllers/IndexController.php similarity index 89% rename from modules/setup/application/controllers/SetupController.php rename to modules/setup/application/controllers/IndexController.php index dbd342d46..113886c88 100644 --- a/modules/setup/application/controllers/SetupController.php +++ b/modules/setup/application/controllers/IndexController.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Web\Controller\ActionController; +use Icinga\Web\Controller\ModuleActionController; use Icinga\Module\Setup\WebWizard; -class SetupController extends ActionController +class Setup_IndexController extends ModuleActionController { /** * Whether the controller requires the user to be authenticated diff --git a/modules/setup/application/views/scripts/setup/index.phtml b/modules/setup/application/views/scripts/index/index.phtml similarity index 98% rename from modules/setup/application/views/scripts/setup/index.phtml rename to modules/setup/application/views/scripts/index/index.phtml index 5b900bd3b..7a0cc7adb 100644 --- a/modules/setup/application/views/scripts/setup/index.phtml +++ b/modules/setup/application/views/scripts/index/index.phtml @@ -137,9 +137,9 @@ if ($notifications->hasMessages()) {
- render('setup/parts/finish.phtml'); ?> + render('index/parts/finish.phtml'); ?> - render('setup/parts/wizard.phtml'); ?> + render('index/parts/wizard.phtml'); ?>
\ No newline at end of file diff --git a/modules/setup/application/views/scripts/setup/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml similarity index 100% rename from modules/setup/application/views/scripts/setup/parts/finish.phtml rename to modules/setup/application/views/scripts/index/parts/finish.phtml diff --git a/modules/setup/application/views/scripts/setup/parts/wizard.phtml b/modules/setup/application/views/scripts/index/parts/wizard.phtml similarity index 100% rename from modules/setup/application/views/scripts/setup/parts/wizard.phtml rename to modules/setup/application/views/scripts/index/parts/wizard.phtml