From 855a5928ce74f72352c454c3d613eea60d39682c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 19 Dec 2008 09:47:13 +0000 Subject: Create a new pattern for Site Admin controllers: 1) They must all start with "admin_". This pattern is not directly routable. 2) Their urls must be /admin/xxx. 3) The Admin_Controller will take the xxx and look for Admin_Xxx_Controller and will delegate to that admin controller, after doing security checks. Moved the users and dashboard views into individual modules for now. --- core/config/routes.php | 5 ++-- core/controllers/admin.php | 37 ++++++++++------------- core/controllers/admin_dashboard.php | 25 ++++++++++++++++ core/helpers/core_menu.php | 2 +- core/views/admin_dashboard.html.php | 57 ++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 25 deletions(-) create mode 100644 core/controllers/admin_dashboard.php create mode 100644 core/views/admin_dashboard.html.php (limited to 'core') diff --git a/core/config/routes.php b/core/config/routes.php index 9a802a27..cf1a9e0d 100644 --- a/core/config/routes.php +++ b/core/config/routes.php @@ -21,10 +21,11 @@ // The abstract REST_Controller is not directly routable. $config["^rest\b.*"] = null; +// Admin controllers are not available, except via /admin +$config["^admin_.*"] = null; + // Redirect /form/add and /form/edit to REST_Controller. $config["^form/(edit|add)/(\w+)/(.*)$"] = "$2/form_$1/$3"; -$config["^admin/(\w+)/(.*)$"] = "$1_admin/$2"; - // For now our default page is the scaffolding. $config["_default"] = "welcome"; diff --git a/core/controllers/admin.php b/core/controllers/admin.php index 9147059b..30e65886 100644 --- a/core/controllers/admin.php +++ b/core/controllers/admin.php @@ -25,32 +25,25 @@ class Admin_Controller extends Controller { parent::__construct(); } - public function index() { - $theme_name = module::get_var("core", "active_admin_theme", "admin_default"); - $template = new Admin_View("admin.html", $theme_name); - $template->content = new View("dashboard.html"); - print $template; - } - - public function __call($page_name, $args) { - $theme_name = module::get_var("core", "active_admin_theme", "admin_default"); - // For now, we have only two legal pages. - // @todo get these pages from the modules - switch($page_name) { - case "users": - $view = new Admin_View("users.html", $theme_name); - $view->users = ORM::factory("user")->find_all(); - break; + public function __call($controller_name, $args) { + if ($controller_name == "index") { + $controller_name = "dashboard"; + } - case "dashboard": - $view = new Admin_View("dashboard.html", $theme_name); - break; + $controller = "Admin_{$controller_name}_Controller"; + $controller = new $controller; - default: - Kohana::show_404(); + if ($args) { + $method = array_unshift($args); + } else { + $method = "index"; } - print $view; + $theme_name = module::get_var("core", "active_admin_theme", "admin_default"); + $template = new Admin_View("admin.html", $theme_name); + $template->content = + call_user_func_array(array(new $controller, $method), $args); + print $template; } } diff --git a/core/controllers/admin_dashboard.php b/core/controllers/admin_dashboard.php new file mode 100644 index 00000000..7d752495 --- /dev/null +++ b/core/controllers/admin_dashboard.php @@ -0,0 +1,25 @@ +append(Menu::factory("link") ->id("dashboard") ->label(_("Dashboard")) - ->url(url::site("admin/dashboard"))) + ->url(url::site("admin"))) ->append(Menu::factory("link") ->id("general_settings") ->label(_("General Settings")) diff --git a/core/views/admin_dashboard.html.php b/core/views/admin_dashboard.html.php new file mode 100644 index 00000000..1cfd8e23 --- /dev/null +++ b/core/views/admin_dashboard.html.php @@ -0,0 +1,57 @@ + +
+

Welcome to Gallery 3!

+
+

This is your administration dashboard and it provides a quick overview of status messages, + recent updates, and frequently used options. Add or remove blocks and rearrange them + to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options + and settings. Here are a few of the most used options to get you started.

+ +
+
+ +
+

Status Messages

+ +
+ +
+

Photo Stream

+
+

Recent photos added to your Gallery

+ " alt="" /> +

Slider type of display. Show titles underneath or on hover. Draw a keyline around albums, or differentiate some how. Each will be linked to item view

+
+
+ +
+

Recent Comments

+ +
+ +
+

Log Entries

+ +
-- cgit v1.2.3