From 6d31beec139727686e028123c8c8fb4e6aaf7a90 Mon Sep 17 00:00:00 2001 From: hukoeth Date: Wed, 11 Aug 2010 20:32:43 +0800 Subject: [PATCH] Added installer. Added check for gallery core version. Some cleanup --- .../controllers/admin_moduleorder.php | 6 ++- .../{module_manager.php => moduleorder.php} | 4 +- .../moduleorder/helpers/moduleorder_event.php | 11 ++++++ .../helpers/moduleorder_installer.php | 38 +++++++++++++++++++ .../views/admin_moduleorder.html.php | 11 +++++- 5 files changed, 65 insertions(+), 5 deletions(-) rename modules/moduleorder/helpers/{module_manager.php => moduleorder.php} (97%) create mode 100644 modules/moduleorder/helpers/moduleorder_installer.php diff --git a/modules/moduleorder/controllers/admin_moduleorder.php b/modules/moduleorder/controllers/admin_moduleorder.php index 01085940..05b8efa0 100644 --- a/modules/moduleorder/controllers/admin_moduleorder.php +++ b/modules/moduleorder/controllers/admin_moduleorder.php @@ -29,7 +29,9 @@ class Admin_Moduleorder_Controller extends Admin_Controller { $view->content->csrf = access::csrf_token(); $view->content->available = new View("admin_moduleorder_blocks.html"); $view->content->active = new View("admin_moduleorder_blocks.html"); - $view->content->available->modules = $this->_get_modules(); + if (module::get_version("gallery") > 31) { + $view->content->available->modules = $this->_get_modules(); + } return $view; } @@ -74,7 +76,7 @@ class Admin_Moduleorder_Controller extends Admin_Controller { private function _get_modules() { $active_blocks = array(); - $available_modules = module_manager::get_available_site_modules(); + $available_modules = moduleorder::get_available_site_modules(); return $available_modules; } } diff --git a/modules/moduleorder/helpers/module_manager.php b/modules/moduleorder/helpers/moduleorder.php similarity index 97% rename from modules/moduleorder/helpers/module_manager.php rename to modules/moduleorder/helpers/moduleorder.php index b26d5f76..3b7820a0 100644 --- a/modules/moduleorder/helpers/module_manager.php +++ b/modules/moduleorder/helpers/moduleorder.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class module_manager_Core { +class moduleorder_Core { static function get_available_site_modules() { return self::_get_modules(); } @@ -29,4 +29,4 @@ class module_manager_Core { } return $modules; } -} \ No newline at end of file +} diff --git a/modules/moduleorder/helpers/moduleorder_event.php b/modules/moduleorder/helpers/moduleorder_event.php index 772ed0d6..84773db1 100644 --- a/modules/moduleorder/helpers/moduleorder_event.php +++ b/modules/moduleorder/helpers/moduleorder_event.php @@ -18,6 +18,17 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class moduleorder_event_Core { + static function module_change($changes) { + // Gallery version must be >= 32 + if (module::get_version("gallery") < 32) { + site_status::warning( + t("The module 'Module Order' requires Gallery core version of 32 or higher."), + "moduleorder_needs_higherversion"); + } else { + site_status::clear("moduleorder_needs_higherversion"); + } + } + static function admin_menu($menu, $theme) { $menu->get("settings_menu") ->append(Menu::factory("link") diff --git a/modules/moduleorder/helpers/moduleorder_installer.php b/modules/moduleorder/helpers/moduleorder_installer.php new file mode 100644 index 00000000..51d08031 --- /dev/null +++ b/modules/moduleorder/helpers/moduleorder_installer.php @@ -0,0 +1,38 @@ + + 31): ?> +

+ +

+

+ +

+

@@ -46,5 +54,6 @@
- Save + Save +