diff options
| author | cash <cash.costello@gmail.com> | 2011-12-08 18:24:29 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-12-08 18:24:29 -0500 |
| commit | c6f8f70f0fd86edf35f6efdef08ff44cb0429778 (patch) | |
| tree | ae97b0d2a4577c21f169f46735742dcb59fed569 /views/default/page/default.php | |
| parent | 19a8af878b74dd9e840fb45c1be4c3a61e93cd64 (diff) | |
| parent | 57e3793a560b9b376b037d5bfe3f1aafaa90c78d (diff) | |
| download | elgg-c6f8f70f0fd86edf35f6efdef08ff44cb0429778.tar.gz elgg-c6f8f70f0fd86edf35f6efdef08ff44cb0429778.tar.bz2 | |
Merge branch '1.8'
Diffstat (limited to 'views/default/page/default.php')
| -rw-r--r-- | views/default/page/default.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/views/default/page/default.php b/views/default/page/default.php index 0e27cda52..892069fad 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -6,8 +6,8 @@ * @package Elgg * @subpackage Core * - * @uses $vars['title'] The page title - * @uses $vars['body'] The main content of the page + * @uses $vars['title'] The page title + * @uses $vars['body'] The main content of the page * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() */ @@ -21,6 +21,13 @@ if (elgg_get_context() == 'admin') { return true; } +// render content before head so that JavaScript and CSS can be loaded. See #4032 +$topbar = elgg_view('page/elements/topbar', $vars); +$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); +$header = elgg_view('page/elements/header', $vars); +$body = elgg_view('page/elements/body', $vars); +$footer = elgg_view('page/elements/footer', $vars); + // Set the content type header("Content-type: text/html; charset=UTF-8"); @@ -33,30 +40,30 @@ header("Content-type: text/html; charset=UTF-8"); <body> <div class="elgg-page elgg-page-default"> <div class="elgg-page-messages"> - <?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?> + <?php echo $messages; ?> </div> <?php if (elgg_is_logged_in()): ?> <div class="elgg-page-topbar"> <div class="elgg-inner"> - <?php echo elgg_view('page/elements/topbar', $vars); ?> + <?php echo $topbar; ?> </div> </div> <?php endif; ?> <div class="elgg-page-header"> <div class="elgg-inner"> - <?php echo elgg_view('page/elements/header', $vars); ?> + <?php echo $header; ?> </div> </div> <div class="elgg-page-body"> <div class="elgg-inner"> - <?php echo elgg_view('page/elements/body', $vars); ?> + <?php echo $body; ?> </div> </div> <div class="elgg-page-footer"> <div class="elgg-inner"> - <?php echo elgg_view('page/elements/footer', $vars); ?> + <?php echo $footer; ?> </div> </div> </div> |