Commit 36430b4c authored by drumm's avatar drumm

#87090 by kkaefer. Render blocks before page content so they may insert headers.

parent 94fbfe8b
......@@ -363,6 +363,9 @@ function theme_placeholder($text) {
* A string containing the entire HTML page.
*/
function theme_page($content) {
// Get blocks before so that they can alter the header (JavaScript, Stylesheets etc.)
$blocks = theme('blocks', 'all');
$output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
$output .= '<html xmlns="http://www.w3.org/1999/xhtml">';
$output .= '<head>';
......@@ -375,7 +378,7 @@ function theme_page($content) {
$output .= ' <body style="background-color: #fff; color: #000;">';
$output .= '<table border="0" cellspacing="4" cellpadding="4"><tr><td style="vertical-align: top; width: 170px;">';
$output .= theme('blocks', 'all');
$output .= $blocks;
$output .= '</td><td style="vertical-align: top;">';
$output .= theme('breadcrumb', drupal_get_breadcrumb());
......
......@@ -32,6 +32,10 @@ function chameleon_page($content, $show_blocks = TRUE) {
$title = drupal_get_title();
// Get blocks before so that they can alter the header (JavaScript, Stylesheets etc.)
$blocks_left = theme_blocks('left');
$blocks_right = theme_blocks('right');
$output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
$output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"$language\" xml:lang=\"$language\">\n";
$output .= "<head>\n";
......@@ -71,10 +75,8 @@ function chameleon_page($content, $show_blocks = TRUE) {
$output .= " <table id=\"content\">\n";
$output .= " <tr>\n";
if ($show_blocks) {
if ($blocks = theme_blocks("left")) {
$output .= " <td id=\"sidebar-left\">$blocks</td>\n";
}
if ($show_blocks && !empty($blocks_left)) {
$output .= " <td id=\"sidebar-left\">$blocks_left</td>\n";
}
$output .= " <td id=\"main\">\n";
......@@ -103,10 +105,8 @@ function chameleon_page($content, $show_blocks = TRUE) {
$output .= " </td>\n";
if ($show_blocks) {
if ($blocks = theme_blocks("right")) {
$output .= " <td id=\"sidebar-right\">$blocks</td>\n";
}
if ($show_blocks && !empty($blocks_right)) {
$output .= " <td id=\"sidebar-right\">$blocks_right</td>\n";
}
$output .= " </tr>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment