Refs #2950: Cleaned up admin sidebar code

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

diff --git a/views/default/admin/sidebar.php b/views/default/admin/sidebar.php
new file mode 100644 (file)
index 0000000..ef3c6a3
--- /dev/null
+++ b/views/default/admin/sidebar.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Admin sidebar -- just outputs the page menu
+ */
+
+$content = elgg_view_menu('page', array('sort_by' => 'weight'));
+
+echo elgg_view_module('main', '', $content);
\ No newline at end of file

diff --git a/views/default/admin/sidebar/menu.php b/views/default/admin/sidebar/menu.php
deleted file mode 100644 (file)
index c33eeac..0000000
--- a/views/default/admin/sidebar/menu.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Admin sidebar menu
- */
-
-$content = elgg_view_menu('page', array('sort_by' => 'weight'));
-
-echo elgg_view_module('main', '', $content);
\ No newline at end of file

diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php
index abe2454ce875de0e1e3be6c6bf72dc6fb7f0fcd5..680f1b12506423bd33171598a9a5d63bd5a812c7 100644 (file)
--- a/views/default/page/layouts/admin.php
+++ b/views/default/page/layouts/admin.php
@@ -57,9 +57,7 @@ echo elgg_view('page/elements/messages', array('object' => $messages));
 <div class="elgg-page-body">
        <div class="elgg-sidebar clearfix">
                <?php
-                       echo elgg_view('admin/sidebar/top', $vars);
-                       echo elgg_view('admin/sidebar/menu', $vars);
-                       echo elgg_view('admin/sidebar/bottom', $vars);
+                       echo elgg_view('admin/sidebar', $vars);
                ?>
        </div>
        <div class="elgg-main elgg-body">