aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-01 15:29:47 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-01 15:29:47 +0000
commitbaec2d08486f1047b02086616ae7a3be305204ef (patch)
tree882e141947b7d6b8123158f6dd5de69b4bab784f
parent1a5afcb864705a0209fe10cfa17fb6cc6edc90c9 (diff)
downloadelgg-baec2d08486f1047b02086616ae7a3be305204ef.tar.gz
elgg-baec2d08486f1047b02086616ae7a3be305204ef.tar.bz2
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
-rw-r--r--engine/lib/admin.php2
-rw-r--r--engine/lib/views.php4
-rw-r--r--views/default/page_shells/admin.php35
3 files changed, 38 insertions, 3 deletions
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 @@
+<?php
+/**
+ * Elgg pageshell for the admin area
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['config'] The site configuration settings, imported
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+// Set title
+if (empty($vars['title'])) {
+ $title = $vars['config']->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