From c46bd97407e2eef500fa224ef7593193e3da6d18 Mon Sep 17 00:00:00 2001 From: Felix Rabinovich Date: Sun, 14 Dec 2008 21:50:10 +0000 Subject: load admin subpages AJAXy way --- core/controllers/admin.php | 34 ++++++++++++++++--------------- core/helpers/core_menu.php | 2 +- themes/default_admin/views/admin.html.php | 12 +++++++---- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/core/controllers/admin.php b/core/controllers/admin.php index 44848028..b082d779 100644 --- a/core/controllers/admin.php +++ b/core/controllers/admin.php @@ -18,34 +18,36 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Admin_Controller extends Controller { - public $template = null; + public $theme_name = null; public function __construct() { if (!(user::active()->admin)) { throw new Exception("Unauthorized", 401); } + // giving default is probably overkill + $this->theme_name = module::get_var("core", "active_admin_theme", "default_admin"); + parent::__construct(); + } + + public function index() { // For now, in order not to duplicate js and css, keep the regular ("item") // theme in addition to admin theme. $item_theme_name = module::get_var("core", "active_theme", "default"); $item_theme = new Theme_View("album.html", "album", $item_theme_name); - // giving default is probably overkill - $theme_name = module::get_var("core", "active_admin_theme", "default_admin"); - $this->template = new Theme_View("admin.html", "admin", $theme_name); - $this->template->item_theme = $item_theme; - parent::__construct(); + $template = new Theme_View("admin.html", "admin", $this->theme_name); + $template->item_theme = $item_theme; + $template->subpage = "dashboard.html"; + print $template; } - public function dashboard() { - $this->template->subpage = "dashboard.html"; - print $this->template; - } - - public function list_users() { - $this->template->set_global("users", ORM::factory("user")->find_all()); - - $this->template->subpage = "list_users.html"; - print $this->template; + public function subpage() { + $template = new Theme_View($_REQUEST["name"] . ".html", "admin", $this->theme_name); + switch ($_REQUEST["name"]) { + case "list_users": + $template->set_global("users", ORM::factory("user")->find_all()); + } + print $template; } } diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php index ecf4c184..69398302 100644 --- a/core/helpers/core_menu.php +++ b/core/helpers/core_menu.php @@ -66,7 +66,7 @@ class core_menu_Core { Menu::factory("link") ->id("site_admin") ->label(_("Site Admin")) - ->url(url::site("admin/dashboard"))); + ->url(url::site("admin"))); } } } diff --git a/themes/default_admin/views/admin.html.php b/themes/default_admin/views/admin.html.php index e37ddbe4..0d1f8e28 100644 --- a/themes/default_admin/views/admin.html.php +++ b/themes/default_admin/views/admin.html.php @@ -13,10 +13,14 @@ " type="text/css" media="screen,projection"> @@ -70,7 +74,7 @@ " id="gLogo" alt="Gallery 3: Your Photos on Your Web Site" />