one_sidebar layout wants breadcrumbs, too!

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

2 files changed, 7 insertions, 4 deletions

diff --git a/views/default/page/layouts/content.php b/views/default/page/layouts/content.php
index 454fbd73f..35d695f0a 100644
--- a/views/default/page/layouts/content.php
+++ b/views/default/page/layouts/content.php
@@ -21,9 +21,6 @@ $params = $vars;
 $params['content'] = $sidebar_content;
 $sidebar = elgg_view('page/layouts/content/sidebar', $params);
 
-// navigation defaults to breadcrumbs
-$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
-
 // allow page handlers to override the default header
 if (isset($vars['header'])) {
 	$vars['header_override'] = $vars['header'];
@@ -45,7 +42,7 @@ $params = $vars;
 $params['content'] = $footer_content;
 $footer = elgg_view('page/layouts/content/footer', $params);
 
-$body = $nav . $header . $filter . $content . $footer;
+$body = $header . $filter . $content . $footer;
 
 $params = array(
 	'content' => $body,
diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index 1e308f979..d74dad53d 100644
--- a/views/default/page/layouts/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
@@ -9,6 +9,7 @@
  * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
  * @uses $vars['title']   Optional title for main content area
  * @uses $vars['class']   Additional class to apply to layout
+ * @uses $vars['nav']     HTML of the page nav (override) (default: breadcrumbs)
  */
 
 $class = 'elgg-layout elgg-layout-one-sidebar clearfix';
@@ -16,6 +17,9 @@ if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }
 
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
 ?>
 
 <div class="<?php echo $class; ?>">
@@ -27,6 +31,8 @@ if (isset($vars['class'])) {
 
 	<div class="elgg-main elgg-body">
 		<?php
+			echo $nav;
+			
 			if (isset($vars['title'])) {
 				echo elgg_view_title($vars['title']);
 			}