From bff46f5fb754515aecbe864715e327c18e4b0db3 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
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/layouts/admin.php | 48 ++----------------------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

(limited to 'views/default/page/layouts')

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'),
-));
-?>
-
-<div class="elgg-page-header">
-	<div class="elgg-inner clearfix">
-		<h1 class="elgg-heading-site">
-			<a href="<?php echo elgg_get_site_url(); ?>pg/admin/">
-				<?php echo $admin_title; ?>
-			</a>
-		</h1>
-		<ul class="elgg-menu-user">
-			<li><?php echo elgg_echo('admin:loggedin', array(elgg_get_logged_in_user_entity()->name)); ?></li>
-			<li><?php echo $view_site; ?></li>
-			<li><?php echo $logout; ?></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-// @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, "");
-	}
-}
-echo elgg_view('page/elements/messages', array('object' => $messages));
 ?>
 
-<div class="elgg-page-body">
+<div class="elgg-layout elgg-layout-one-sidebar">
 	<div class="elgg-sidebar clearfix">
 		<?php
 			echo elgg_view('admin/sidebar', $vars);
@@ -74,6 +32,4 @@ echo elgg_view('page/elements/messages', array('object' => $messages));
 			}
 		?>
 	</div>
-</div>
-<div class="elgg-page-footer">
-</div>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3