diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-07-30 08:28:47 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-07-30 08:28:47 +0000 |
| commit | 16632e07e475aa405793bc098e8c1e6f68e01fce (patch) | |
| tree | feacdee4d8390d7357ddd3124a1f9309547200e1 | |
| parent | f6a23032093dceb5fac0c4db448207a528ddd626 (diff) | |
| download | brdo-16632e07e475aa405793bc098e8c1e6f68e01fce.tar.gz brdo-16632e07e475aa405793bc098e8c1e6f68e01fce.tar.bz2 | |
- Patch #534414 by Gábor Hojtsy: fix missing docs and consistency issues with and .
| -rw-r--r-- | CHANGELOG.txt | 1 | ||||
| -rw-r--r-- | modules/system/page.tpl.php | 17 | ||||
| -rw-r--r-- | themes/garland/page.tpl.php | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 360c663b9..d1add72de 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -95,6 +95,7 @@ Drupal 7.0, xxxx-xx-xx (development version) on as contributed themes (http://drupal.org/project/bluemarine, http://drupal.org/project/chameleon and http://drupal.org/project/pushbutton). * Added Stark theme to make analyzing Drupal's default HTML and CSS easier. + * Added Slate theme as the default administration interface theme. - File handling: * Files are now first class Drupal objects with file_load(), file_save(), and file_validate() functions and corresponding hooks. diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index dec95356f..ac6e2c383 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -81,10 +81,14 @@ * - $right: Items for the right sidebar. * - $highlight: Items for the highlighted content region. * - * Footer/closing data: + * Opening and closing data: + * - $page_top: Initial markup from any modules that have altered the + * page. This variable should always be output first, before all other dynamic + * content. * - $footer : The footer region. - * - $closure: Final closing markup from any modules that have altered the page. - * This variable should always be output last, after all other dynamic content. + * - $page_bottom: Final closing markup from any modules that have altered the + * page. This variable should always be output last, after all other dynamic + * content. * * @see template_preprocess() * @see template_preprocess_page() @@ -104,11 +108,8 @@ </head> <body class="<?php print $classes; ?>"> - <?php if ($page_top): ?> - <div id="page-top-region" class="clearfix"> - <?php print $page_top; ?> - </div> - <?php endif; ?> + <?php print $page_top; ?> + <div id="page-wrapper"><div id="page"> <div id="header"><div class="section clearfix"> diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php index 16221026d..0f05af635 100644 --- a/themes/garland/page.tpl.php +++ b/themes/garland/page.tpl.php @@ -15,11 +15,7 @@ </head> <body class="<?php print $classes ?>"> - <?php if ($page_top): ?> - <div id="page-top-region" class="clearfix"> - <?php print $page_top; ?> - </div> - <?php endif; ?> + <?php print $page_top; ?> <div id="header-region" class="clearfix"><?php print $header ?></div> |