From 77c79deec262938410fe02e6cba7cb0568de703b Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 4 Dec 2011 13:49:35 -0500 Subject: Fixes #4032 rendering page elements before head/foot --- views/default/page/admin.php | 27 ++++++++++++++++----------- views/default/page/default.php | 21 ++++++++++++++------- 2 files changed, 30 insertions(+), 18 deletions(-) (limited to 'views') diff --git a/views/default/page/admin.php b/views/default/page/admin.php index cd03541d5..7045edd91 100644 --- a/views/default/page/admin.php +++ b/views/default/page/admin.php @@ -5,16 +5,11 @@ * @package Elgg * @subpackage Core * - * @uses $vars['title'] The page title - * @uses $vars['body'] The main content of the page + * @uses $vars['title'] The page title + * @uses $vars['body'] The main content of the page * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() */ -// Set the content type -header("Content-type: text/html; charset=UTF-8"); - -$messages = $vars['sysmessages']; - $notices_html = ''; $notices = elgg_get_admin_notices(); if ($notices) { @@ -25,6 +20,16 @@ if ($notices) { $notices_html = "
$notices_html
"; } +// render content before head so that JavaScript and CSS can be loaded. See #4032 +$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); +$header = elgg_view('admin/header', $vars); +$body = $vars['body']; +$footer = elgg_view('admin/footer', $vars); + + +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + ?> @@ -36,21 +41,21 @@ if ($notices) {
- +
- $messages)); ?> +
- +
- +
diff --git a/views/default/page/default.php b/views/default/page/default.php index 0e27cda52..892069fad 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -6,8 +6,8 @@ * @package Elgg * @subpackage Core * - * @uses $vars['title'] The page title - * @uses $vars['body'] The main content of the page + * @uses $vars['title'] The page title + * @uses $vars['body'] The main content of the page * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() */ @@ -21,6 +21,13 @@ if (elgg_get_context() == 'admin') { return true; } +// render content before head so that JavaScript and CSS can be loaded. See #4032 +$topbar = elgg_view('page/elements/topbar', $vars); +$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); +$header = elgg_view('page/elements/header', $vars); +$body = elgg_view('page/elements/body', $vars); +$footer = elgg_view('page/elements/footer', $vars); + // Set the content type header("Content-type: text/html; charset=UTF-8"); @@ -33,30 +40,30 @@ header("Content-type: text/html; charset=UTF-8");
- $vars['sysmessages'])); ?> +
- +
- +
- +
- +
-- cgit v1.2.3 From 92c9154b816a29c70fbcebfd85ad2cf3d021ddf2 Mon Sep 17 00:00:00 2001 From: Jeroen Dalsem Date: Tue, 6 Dec 2011 11:50:59 +0100 Subject: delete action expects widget_guid instead of guid --- views/default/object/widget/elements/controls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views') diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php index 6d06d28bc..866dcc787 100644 --- a/views/default/object/widget/elements/controls.php +++ b/views/default/object/widget/elements/controls.php @@ -22,7 +22,7 @@ if ($widget->canEdit()) { $params = array( 'text' => elgg_view_icon('delete-alt'), 'title' => elgg_echo('widget:delete', array($widget->getTitle())), - 'href' => "action/widgets/delete?guid=$widget->guid", + 'href' => "action/widgets/delete?widget_guid=$widget->guid", 'is_action' => true, 'is_trusted' => true, 'class' => 'elgg-widget-delete-button', -- cgit v1.2.3