Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 36 insertions, 0 deletions

diff --git a/views/default/admin/components/admin_page_layout.php b/views/default/admin/components/admin_page_layout.php
new file mode 100644
index 000000000..4f2a67d48
--- /dev/null
+++ b/views/default/admin/components/admin_page_layout.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Elgg admin page layout.  Includes the admin sidebar and the ownerblock (for legacy support)
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$notices_html = '';
+if ($notices = elgg_get_admin_notices()) {
+	foreach ($notices as $notice) {
+		$notices_html .= elgg_view_entity($notice);
+	}
+}
+
+?>
+<div id="elgg_content" class="clearfloat sidebar">
+	<div id="elgg_sidebar">
+		<?php
+			echo elgg_view('admin/components/sidemenu', $vars);
+			echo '<hr />';
+			echo elgg_view('page_elements/owner_block');
+		?>
+	</div>
+
+	<div id="elgg_page_contents" class="clearfloat">
+		<?php
+			if ($notices) {
+				echo "<div class=\"admin_notices\">$notices_html</div>";
+			}
+			echo $vars['content'];
+		?>
+	</div>
+</div>