From fd1acc79bce6c6e1cee19040857b6d8e073cbc2f Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 8 Jan 2011 18:24:36 +0000
Subject: drying up the title creation in the admin backend

git-svn-id: http://code.elgg.org/elgg/trunk@7864 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/layout/shells/admin.php          | 44 ++++++++++++++++++++++++++
 views/default/layout/shells/administration.php | 39 -----------------------
 2 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 views/default/layout/shells/admin.php
 delete mode 100644 views/default/layout/shells/administration.php

(limited to 'views/default/layout')

diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php
new file mode 100644
index 000000000..e33c1c62f
--- /dev/null
+++ b/views/default/layout/shells/admin.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Elgg Admin Area Canvas
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['content'] Content string
+ * @uses $vars['sidebar'] Optional sidebar content
+ * @uses $vars['title']   Title string
+ */
+?>
+
+<div class="elgg-page-header">
+	<div class="elgg-inner">
+		<h1>
+			<a href="<?php echo elgg_get_site_url(); ?>">
+				<?php echo $vars['config']->sitename; echo " " . elgg_echo('admin'); ?>
+			</a>
+		</h1>
+		<a class="return_to_network" href="<?php echo elgg_get_site_url(); ?>">&lt;&lt; Return to network</a>
+	</div>
+</div>
+
+<div class="elgg-page-body">
+	
+	<div class="elgg-sidebar clearfix">
+		<?php
+			echo elgg_view('layout/elements/sidebar', $vars);
+		?>
+	</div>
+	<div class="elgg-main elgg-body">
+		<?php
+			if (isset($vars['title'])) {
+				echo elgg_view_title($vars['title']);
+			}
+			
+			if (isset($vars['content'])) {
+				echo $vars['content'];
+			}
+		?>
+	</div>
+</div>
+<div class="elgg-page-footer"></div>
\ No newline at end of file
diff --git a/views/default/layout/shells/administration.php b/views/default/layout/shells/administration.php
deleted file mode 100644
index 0740ed78e..000000000
--- a/views/default/layout/shells/administration.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Elgg Admin Area Canvas
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['content'] Content string
- * @uses $vars['sidebar'] Optional sidebar content
- */
-?>
-
-<div class="elgg-page-header">
-	<div class="elgg-inner">
-		<h1>
-			<a href="<?php echo elgg_get_site_url(); ?>">
-				<?php echo $vars['config']->sitename; echo " " . elgg_echo('admin'); ?>
-			</a>
-		</h1>
-		<a class="return_to_network" href="<?php echo elgg_get_site_url(); ?>">&lt;&lt; Return to network</a>
-	</div>
-</div>
-
-<div class="elgg-page-body">
-	
-	<div class="elgg-sidebar clearfix">
-		<?php
-			echo elgg_view('layout/elements/sidebar', $vars);
-		?>
-	</div>
-	<div class="elgg-main elgg-body">
-		<?php
-			if (isset($vars['content'])) {
-				echo $vars['content'];
-			}
-		?>
-	</div>
-</div>
-<div class="elgg-page-footer"></div>
\ No newline at end of file
-- 
cgit v1.2.3