one_column layout was not showing title and nav

diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index a5854f8c1d78e80a48bd745265df168d68eeab1a..9f028d8b5c05d47ca0ca87067fba6626ddfbec4d 100644 (file)
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -75,9 +75,6 @@
 .elgg-layout {
        min-height: 360px;
 }
-.elgg-layout-one-column {
-       padding: 10px 0;
-}
 .elgg-layout-one-sidebar {
        background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
 }

diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php
index c59a574e7d7eb1bd4a648b14fcd0c35bbc5573c5..7546a4cdf606e6a00aba454d71ac17db7d85d471 100644 (file)
--- a/views/default/page/layouts/one_column.php
+++ b/views/default/page/layouts/one_column.php
@@ -13,11 +13,22 @@ $class = 'elgg-layout elgg-layout-one-column clearfix';
 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; ?>">
-       <div class="elgg-body">
-       <?php echo $vars['content']; ?>
+       <div class="elgg-body elgg-main">
        <?php
+               echo $nav;
+
+               if (isset($vars['title'])) {
+                       echo elgg_view_title($vars['title']);
+               }
+
+               echo $vars['content'];
+               
                // @deprecated 1.8
                echo $vars['area1'];
        ?>