diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 22:22:17 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 22:22:17 +0000 |
| commit | fd2addc592a2b7ffed71439f102969c79120e0e8 (patch) | |
| tree | c9229ad3be4c2fcdfceb1aa04ef7da2d0d6a4c35 /views | |
| parent | 68498fdfb1fcb5e46f6d22722748cd030d050ad7 (diff) | |
| download | elgg-fd2addc592a2b7ffed71439f102969c79120e0e8.tar.gz elgg-fd2addc592a2b7ffed71439f102969c79120e0e8.tar.bz2 | |
Merged in a lost change for the interface.
git-svn-id: http://code.elgg.org/elgg/trunk@5263 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/page_shells/default.php | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php index 61396dfbc..b098ddf59 100644 --- a/views/default/page_shells/default.php +++ b/views/default/page_shells/default.php @@ -25,34 +25,12 @@ if (empty($vars['title'])) { } else { $title = $vars['config']->sitename . ": " . $vars['title']; } -?> -<?php echo elgg_view('page_elements/header', $vars); ?> -<?php echo elgg_view('page_elements/elgg_topbar', $vars); ?> -<?php echo elgg_view('page_elements/header_contents', $vars); ?> - -<!-- main contents --> - -<!-- display any system messages --> -<?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?> - - -<!-- canvas --> -<div id="layout_canvas"> - -<?php echo $vars['body']; ?> - -<div class="clearfloat"></div> -</div><!-- /#layout_canvas --> - -<?php -if(isloggedin()){ -?> - <!-- spotlight --> - <?php echo elgg_view('page_elements/spotlight', $vars); ?> -<?php -} -?> - -<!-- footer --> -<?php echo elgg_view('page_elements/footer', $vars); ?>
\ No newline at end of file +echo elgg_view('page_elements/html_begin', $vars); +echo elgg_view('page_elements/elgg_topbar', $vars); +// @todo this probably should be somewhere else +echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); +echo elgg_view('page_elements/elgg_header', $vars); +echo elgg_view('page_elements/elgg_content', $vars); +echo elgg_view('page_elements/elgg_footer', $vars); +echo elgg_view('page_elements/html_end', $vars); |