From baec2d08486f1047b02086616ae7a3be305204ef Mon Sep 17 00:00:00 2001 From: dave Date: Thu, 1 Jul 2010 15:29:47 +0000 Subject: added a parameter to the page_draw function so you can specify a different page shell if required. git-svn-id: http://code.elgg.org/elgg/trunk@6602 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/admin.php | 2 +- engine/lib/views.php | 4 ++-- views/default/page_shells/admin.php | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 views/default/page_shells/admin.php diff --git a/engine/lib/admin.php b/engine/lib/admin.php index a1992aa15..ad7896cb7 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -208,7 +208,7 @@ function admin_settings_page_handler($page) { } $body = elgg_view_layout('administration', $content); - page_draw($title, $body); + page_draw($title, $body, "", 'page_shells/admin'); } /** diff --git a/engine/lib/views.php b/engine/lib/views.php index 60078fa7a..c1c07024a 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1019,7 +1019,7 @@ function autoregister_views($view_base, $folder, $base_location_path, $viewtype) * @param unknown_type $body * @return unknown */ -function page_draw($title, $body, $sidebar = "") { +function page_draw($title, $body, $sidebar = "", $page_shell = 'page_shells/default') { // get messages - try for errors first $sysmessages = system_messages(null, "errors"); @@ -1032,7 +1032,7 @@ function page_draw($title, $body, $sidebar = "") { } // Draw the page - $output = elgg_view('page_shells/default', array( + $output = elgg_view($page_shell, array( 'title' => $title, 'body' => $body, 'sidebar' => $sidebar, diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php new file mode 100644 index 000000000..29b704438 --- /dev/null +++ b/views/default/page_shells/admin.php @@ -0,0 +1,35 @@ +sitename; +} else if (empty($vars['config']->sitename)) { + $title = $vars['title']; +} else { + $title = $vars['config']->sitename . ": " . $vars['title']; +} + +echo elgg_view('page_elements/html_begin', $vars); +echo elgg_view('page_elements/elgg_topbar', $vars); +// @todo this probably should be somewhere else +echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); +echo elgg_view('page_elements/elgg_header', $vars); +echo elgg_view('page_elements/elgg_content', $vars); +echo elgg_view('page_elements/elgg_footer', $vars); +echo elgg_view('page_elements/html_end', $vars); \ No newline at end of file -- cgit v1.2.3