From b526cc8c0bea4033a1ffadd6706f073f9cb90eeb Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 22 Dec 2008 03:53:36 +0000 Subject: Add some admin theme callbacks and make them explicitly admin_xxx for consistency with the callbacks in the xxx_block helpers. So in the theme we have: admin.html.php: $theme->admin_page_bottom() then in the helpers: core_block.php: function admin_page_bottom() { } --- core/helpers/core_block.php | 7 +++++++ core/libraries/Admin_View.php | 8 +++++--- core/libraries/Theme_View.php | 1 + themes/admin_default/views/admin.html.php | 6 ++++-- themes/default/views/footer.html.php | 1 + 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php index 06354a10..ec1ee066 100644 --- a/core/helpers/core_block.php +++ b/core/helpers/core_block.php @@ -30,6 +30,13 @@ class core_block_Core { } } + public static function admin_page_bottom($theme) { + if (Session::instance()->get("profiler", false)) { + $profiler = new Profiler(); + $profiler->render(); + } + } + public static function admin_dashboard_blocks($theme) { $block = new Block(); $block->id = "gWelcome"; diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php index 5752d659..c172b76b 100644 --- a/core/libraries/Admin_View.php +++ b/core/libraries/Admin_View.php @@ -65,9 +65,11 @@ class Admin_View_Core extends View { */ public function __call($function, $args) { switch ($function) { - case "dashboard_blocks": - case "sidebar_blocks": - $function = "admin_$function"; + case "admin_dashboard_blocks": + case "admin_footer": + case "admin_page_bottom": + case "admin_page_top": + case "admin_sidebar_blocks": $blocks = array(); foreach (module::installed() as $module) { $helper_class = "{$module->name}_block"; diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php index 02609063..3144ca2a 100644 --- a/core/libraries/Theme_View.php +++ b/core/libraries/Theme_View.php @@ -93,6 +93,7 @@ class Theme_View_Core extends View { case "album_bottom": case "album_top": case "credits"; + case "footer": case "head": case "header_bottom": case "header_top": diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 6aa5c3c9..0bd90237 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -22,6 +22,7 @@ + admin_page_top() ?>

@@ -58,16 +59,17 @@

- sidebar_blocks() ?> + admin_sidebar_blocks() ?>

+ admin_footer(); ?> Footer

- + admin_page_bottom() ?> diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php index 7f011735..b5f842b7 100644 --- a/themes/default/views/footer.html.php +++ b/themes/default/views/footer.html.php @@ -1,4 +1,5 @@ +footer() ?>;