From bff46f5fb754515aecbe864715e327c18e4b0db3 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 22 Feb 2011 23:15:23 +0000 Subject: extracted admin header, footer to admin/*. Moved pageshell code from admin layout to admin pageshell. git-svn-id: http://code.elgg.org/elgg/trunk@8431 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page/admin.php | 31 ++++++++++++++++++++++- views/default/page/layouts/admin.php | 48 ++---------------------------------- 2 files changed, 32 insertions(+), 47 deletions(-) (limited to 'views/default/page') diff --git a/views/default/page/admin.php b/views/default/page/admin.php index 211bd4037..aa8581a74 100644 --- a/views/default/page/admin.php +++ b/views/default/page/admin.php @@ -12,6 +12,20 @@ // Set the content type header("Content-type: text/html; charset=UTF-8"); + +// @todo clean up system messages code +$messages = null; +if (count_messages()) { + // get messages - try for errors first + $messages = system_messages(NULL, "error"); + if (count($messages["error"]) == 0) { + // no errors so grab rest of messages + $messages = system_messages(null, ""); + } else { + // we have errors - clear out remaining messages + system_messages(null, ""); + } +} ?> @@ -20,7 +34,22 @@ header("Content-type: text/html; charset=UTF-8");

- + +

+ $messages)); ?> +

+ +

diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php index 680f1b125..890c8a06e 100644 --- a/views/default/page/layouts/admin.php +++ b/views/default/page/layouts/admin.php @@ -10,51 +10,9 @@ * @uses $vars['title'] Title string */ -$admin_title = elgg_get_site_entity()->name . ' ' . elgg_echo('admin'); - -$view_site = elgg_view('output/url', array( - 'href' => elgg_get_site_url(), - 'text' => elgg_echo('admin:view_site'), -)); -$logout = elgg_view('output/url', array( - 'href' => 'action/logout', - 'text' => elgg_echo('logout'), -)); -?> - - - - $messages)); ?> -

+ - +

\ No newline at end of file -- cgit v1.2.3