added a parameter to the page_draw function so you can specify a different page shell...

git-svn-id: http://code.elgg.org/elgg/trunk@6602 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index a1992aa154ef9c1d26b7e1273c1f62bfae41b3b5..ad7896cb7080929c051777c77f44f48c043d9858 100644 (file)
--- 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 60078fa7a212ec6d9690566c6e1d9260f87bc0b7..c1c07024a99e857792889853fa1945557c46b737 100644 (file)
--- 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 (file)
index 0000000..29b7044
--- /dev/null
+++ b/views/default/page_shells/admin.php
@@ -0,0 +1,35 @@
+<?php\r
+/**\r
+ * Elgg pageshell for the admin area\r
+ *\r
+ * @package Elgg\r
+ * @subpackage Core\r
+ * @author Curverider Ltd\r
+ * @link http://elgg.org/\r
+ *\r
+ * @uses $vars['config'] The site configuration settings, imported\r
+ * @uses $vars['title'] The page title\r
+ * @uses $vars['body'] The main content of the page\r
+ * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()\r
+ */\r
+\r
+// Set the content type\r
+header("Content-type: text/html; charset=UTF-8");\r
+\r
+// Set title\r
+if (empty($vars['title'])) {\r
+       $title = $vars['config']->sitename;\r
+} else if (empty($vars['config']->sitename)) {\r
+       $title = $vars['title'];\r
+} else {\r
+       $title = $vars['config']->sitename . ": " . $vars['title'];\r
+}\r
+\r
+echo elgg_view('page_elements/html_begin', $vars);\r
+echo elgg_view('page_elements/elgg_topbar', $vars);\r
+// @todo this probably should be somewhere else \r
+echo elgg_view('messages/list', array('object' => $vars['sysmessages']));\r
+echo elgg_view('page_elements/elgg_header', $vars);\r
+echo elgg_view('page_elements/elgg_content', $vars);\r
+echo elgg_view('page_elements/elgg_footer', $vars);\r
+echo elgg_view('page_elements/html_end', $vars);
\ No newline at end of file