diff options
| author | cash <cash.costello@gmail.com> | 2011-06-25 20:27:02 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-06-25 20:27:02 -0400 |
| commit | 59774f1999752f941d48dcae43d53d4a6cc8c0c0 (patch) | |
| tree | fa295d7eed744c3d484fee2bc65157cfcdfccc69 | |
| parent | 8e657574c0c7844b5dffb933a017bc8acd3e5295 (diff) | |
| download | elgg-59774f1999752f941d48dcae43d53d4a6cc8c0c0.tar.gz elgg-59774f1999752f941d48dcae43d53d4a6cc8c0c0.tar.bz2 | |
one_column layout was not showing title and nav
| -rw-r--r-- | views/default/css/elements/layout.php | 3 | ||||
| -rw-r--r-- | views/default/page/layouts/one_column.php | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index a5854f8c1..9f028d8b5 100644 --- 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 c59a574e7..7546a4cdf 100644 --- 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']; ?> |