diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-22 23:15:23 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-22 23:15:23 +0000 |
| commit | bff46f5fb754515aecbe864715e327c18e4b0db3 (patch) | |
| tree | 2d4fc1b48fe646416ef67130552a81221d1522b7 /views/default/page/admin.php | |
| parent | 2e55e477f93fc7e2e26e5d01395fd8d47c283c27 (diff) | |
| download | elgg-bff46f5fb754515aecbe864715e327c18e4b0db3.tar.gz elgg-bff46f5fb754515aecbe864715e327c18e4b0db3.tar.bz2 | |
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
Diffstat (limited to 'views/default/page/admin.php')
| -rw-r--r-- | views/default/page/admin.php | 31 |
1 files changed, 30 insertions, 1 deletions
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, ""); + } +} ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -20,7 +34,22 @@ header("Content-type: text/html; charset=UTF-8"); </head> <body> <div class="elgg-page elgg-page-admin"> - <?php echo $vars['body']; ?> + <div class="elgg-page-header"> + <div class="elgg-inner clearfix"> + <?php echo elgg_view('admin/header'); ?> + </div> + </div> + <div class="elgg-page-messages"> + <?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?> + </div> + <div class="elgg-page-body"> + <?php echo $vars['body']; ?> + </div> + <div class="elgg-page-footer"> + <div class="elgg-inner"> + <?php echo elgg_view('admin/footer'); ?> + </div> + </div> </div> <?php echo elgg_view('footer/analytics'); ?> </body> |