diff options
Diffstat (limited to 'views/default/page/layouts/two_sidebar.php')
| -rw-r--r-- | views/default/page/layouts/two_sidebar.php | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php index 817b02dc6..7521dd44f 100644 --- a/views/default/page/layouts/two_sidebar.php +++ b/views/default/page/layouts/two_sidebar.php @@ -5,10 +5,10 @@ * @package Elgg * @subpackage Core * - * @uses $vars['content'] The content string for the main column - * @uses $vars['sidebar'] Optional content that is displayed in the sidebar + * @uses $vars['content'] The content string for the main column + * @uses $vars['sidebar'] Optional content that is displayed in the sidebar * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar - * @uses $vars['class'] Additional class to apply to layout + * @uses $vars['class'] Additional class to apply to layout */ $class = 'elgg-layout elgg-layout-two-sidebar clearfix'; @@ -19,28 +19,25 @@ if (isset($vars['class'])) { <div class="<?php echo $class; ?>"> <div class="elgg-sidebar"> - <?php echo elgg_view('page/elements/sidebar', $vars); ?> + <?php + echo elgg_view('page/elements/sidebar', $vars); + ?> + </div> + <div class="elgg-sidebar-alt"> + <?php + echo elgg_view('page/elements/sidebar_alt', $vars); + ?> </div> - <div class="elgg-body"> - <div class="elgg-head"> - <?php echo elgg_view('page/elements/title', $vars); ?> - </div> - <?php - // allow page handlers to override the default header + + <div class="elgg-main elgg-body"> + <?php + // @todo deprecated so remove in Elgg 2.0 + if (isset($vars['area1'])) { + echo $vars['area1']; + } + if (isset($vars['content'])) { + echo $vars['content']; + } ?> - <div class="elgg-sidebar-alt"> - <?php echo elgg_view('page/elements/sidebar_alt', $vars); ?> - </div> - <div class="elgg-body elgg-main"> - <?php - // @todo deprecated so remove in Elgg 2.0 - if (isset($vars['area1'])) { - echo $vars['area1']; - } - if (isset($vars['content'])) { - echo $vars['content']; - } - ?> - </div> </div> -</div>
\ No newline at end of file +</div> |