aboutsummaryrefslogtreecommitdiff
path: root/views/default/page/default.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2011-12-31 20:14:45 +0100
committerSem <sembrestels@riseup.net>2011-12-31 20:14:45 +0100
commit9f4da6d87f2c520b975f968cedbcde4f3dce1a25 (patch)
treefee953cf498b6083faf56c61042d3bee07110331 /views/default/page/default.php
parenta22660e997611fe2afb97689ea23774578ee80db (diff)
parente49df853b2cc3a6a9bc2dd527a64951050142eb9 (diff)
downloadelgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.gz
elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.bz2
Merge git://github.com/Elgg/Elgg
Diffstat (limited to 'views/default/page/default.php')
-rw-r--r--views/default/page/default.php21
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>