sidebar menu deserves its own view

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

3 files changed, 20 insertions, 9 deletions

diff --git a/views/default/navigation/sidebar_menu.php b/views/default/navigation/sidebar_menu.php
new file mode 100644
index 000000000..b03a5540b
--- /dev/null
+++ b/views/default/navigation/sidebar_menu.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Elgg sidebar menu
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+// Plugins can add to the sidebar menu by calling elgg_add_submenu_item()
+$submenu = elgg_get_submenu();
+
+echo $submenu;
diff --git a/views/default/page_elements/elgg_sidebar.php b/views/default/page_elements/elgg_sidebar.php
index a8d3239ab..075c509be 100644
--- a/views/default/page_elements/elgg_sidebar.php
+++ b/views/default/page_elements/elgg_sidebar.php
@@ -6,6 +6,8 @@
 
 echo elgg_view('page_elements/owner_block');
 
+echo elgg_view('navigation/sidebar_menu');
+
 if (isset($vars['area2'])) {
 	echo $vars['area2'];
 }
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 12341bec7..dfe1dfcc4 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -79,15 +79,9 @@ $contents .= elgg_view('owner_block/extend');
 
 
 // Have we been asked to inject any content? If so, display it
-if (isset($vars['content']))
+if (isset($vars['content'])) {
 	$contents .= $vars['content'];
+}
 
-// Initialise the current tool/page submenu (plugins can add to the submenu)
-$submenu = elgg_get_submenu();
-
-if (!empty($submenu))
-	$contents .= $submenu;
 
-if (!empty($contents)) {
-	echo $contents;
-}
\ No newline at end of file
+echo $contents;