]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 87e2742)
Fixes #4032 rendering page elements before head/foot
authorCash Costello <cash.costello@gmail.com>
Sun, 4 Dec 2011 18:49:35 +0000 (13:49 -0500)
committerCash Costello <cash.costello@gmail.com>
Sun, 4 Dec 2011 18:49:35 +0000 (13:49 -0500)
views/default/page/admin.php patch | blob | history
views/default/page/default.php patch | blob | history

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index cd03541d52f6f3ed4dc55776bc71d057470c4f27..7045edd91f08089792e9b709f9998e717cfba206 100644 (file)
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -5,16 +5,11 @@
  * @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()
  */
 
-// Set the content type
-header("Content-type: text/html; charset=UTF-8");
-
-$messages = $vars['sysmessages'];
-
 $notices_html = '';
 $notices = elgg_get_admin_notices();
 if ($notices) {
@@ -25,6 +20,16 @@ if ($notices) {
        $notices_html = "<div class=\"elgg-admin-notices\">$notices_html</div>";
 }
 
+// render content before head so that JavaScript and CSS can be loaded. See #4032
+$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
+$header = elgg_view('admin/header', $vars);
+$body = $vars['body'];
+$footer = elgg_view('admin/footer', $vars);
+
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -36,21 +41,21 @@ if ($notices) {
                <div class="elgg-inner">
                        <div class="elgg-page-header">
                                <div class="elgg-inner clearfix">
-                                       <?php echo elgg_view('admin/header'); ?>
+                                       <?php echo $header; ?>
                                </div>
                        </div>
                        <div class="elgg-page-messages">
-                               <?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?>
+                               <?php echo $messages; ?>
                                <?php echo $notices_html; ?>
                        </div>
                        <div class="elgg-page-body">
                                <div class="elgg-inner">
-                                       <?php echo $vars['body']; ?>
+                                       <?php echo $body; ?>
                                </div>
                        </div>
                        <div class="elgg-page-footer">
                                <div class="elgg-inner">
-                                       <?php echo elgg_view('admin/footer'); ?>
+                                       <?php echo $footer; ?>
                                </div>
                        </div>
                </div>
diff --git a/views/default/page/default.php b/views/default/page/default.php
index 0e27cda52e5b8e510f789bf85bc03ec0b5b699d5..892069fade9096a1ccd15d2dba1c9d89b8540e38 100644 (file)
--- 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>
Social Networking Engine