Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.722
diff -u -r1.722 system.module
--- modules/system/system.module 5 Jul 2009 18:00:10 -0000 1.722
+++ modules/system/system.module 8 Jul 2009 16:15:38 -0000
@@ -262,6 +262,7 @@
'#show_messages' => TRUE,
'#show_blocks' => TRUE,
'#theme' => 'page',
+ '#theme_wrapper' => 'html',
);
$type['list'] = array(
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.24
diff -u -r1.24 page.tpl.php
--- modules/system/page.tpl.php 4 Jul 2009 05:21:15 -0000 1.24
+++ modules/system/page.tpl.php 8 Jul 2009 16:15:34 -0000
@@ -10,7 +10,6 @@
* General utility variables:
* - $base_path: The base URL path of the Drupal installation. At the very
* least, this will always default to /.
- * - $css: An array of CSS files for the current page.
* - $directory: The directory the template is located in, e.g. modules/system
* or themes/garland.
* - $classes_array: Array of html class attribute values. It is flattened
@@ -20,21 +19,9 @@
* - $is_admin: TRUE if the user has permission to access administration pages.
*
* Page metadata:
- * - $language: (object) The language the site is being displayed in.
- * $language->language contains its textual representation.
- * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
- * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document.
- * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data.
- * - $head_title: A modified version of the page title, for use in the TITLE tag.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
- * so on).
- * - $styles: Style tags necessary to import all CSS files for the page.
- * - $scripts: Script tags necessary to load the JavaScript files and settings
- * for the page.
* - $classes: String of classes that can be used to style contextually through
- * CSS. It should be placed within the tag. When selecting through CSS
- * it's recommended that you use the body tag, e.g., "body.front". It can be
- * manipulated through the variable $classes_array from preprocess functions.
+ * CSS. It can be manipulated through the variable $classes_array from
+ * preprocess functions.
* The default values can be one or more of the following:
* - page: The current template type, i.e., "theming hook".
* - front: Page is the home page.
@@ -74,39 +61,26 @@
* - $messages: HTML for status and error messages. Should be displayed prominently.
* - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view
* and edit tabs when displaying a node).
- * - $help: Dynamic help text, mostly for admin pages.
- * - $content: The main content of the current page.
* - $feed_icons: A string of all feed icons for the current page.
- * - $left: Items for the left sidebar.
- * - $right: Items for the right sidebar.
- * - $highlight: Items for the highlighted content region.
- *
- * Footer/closing data:
- * - $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.
+ *
+ * Regions:
+ * - $page['help']: Dynamic help text, mostly for admin pages.
+ * - $page['highlight']: Items for the highlighted content region.
+ * - $page['content']: The main content of the current page.
+ * - $page['left']: Items for the left sidebar.
+ * - $page['right']: Items for the right sidebar.
+ * - $page['header']: Items for the header region.
+ * - $page['footer']: Items for the footer region.
+ * - $page['page_top']: Items for the top region.
*
* @see template_preprocess()
- * @see template_preprocess_page()
* @see template_process()
*/
?>
-
->
-
-
- <?php print $head_title; ?>
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -143,9 +117,9 @@
-
+
-
+
@@ -166,25 +140,31 @@
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -192,12 +172,11 @@
-
-
-
-
-
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.930
diff -u -r1.930 common.inc
--- includes/common.inc 4 Jul 2009 18:26:42 -0000 1.930
+++ includes/common.inc 8 Jul 2009 16:15:32 -0000
@@ -4043,6 +4043,10 @@
'placeholder' => array(
'arguments' => array('text' => NULL)
),
+ 'html' => array(
+ 'arguments' => array('page' => NULL),
+ 'template' => 'html',
+ ),
'page' => array(
'arguments' => array('page' => NULL),
'template' => 'page',
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.497
diff -u -r1.497 theme.inc
--- includes/theme.inc 2 Jul 2009 04:27:22 -0000 1.497
+++ includes/theme.inc 8 Jul 2009 16:15:33 -0000
@@ -1878,6 +1878,51 @@
}
/**
+ * Preprocess variables for html.tpl.php
+ *
+ * @see system_elements()
+ * @see html.tpl.php
+ */
+function template_preprocess_html(&$variables) {
+ // Place the rendered HTML for the page body into a top level variable.
+ $variables['page'] = $variables['page']['#children'];
+ // RDFa allows annotation of XHTML pages with RDF data, while GRDDL provides
+ // mechanisms for extraction of this RDF content via XSLT transformation
+ // using an associated GRDDL profile.
+ $variables['rdf_namespaces'] = drupal_get_rdf_namespaces();
+ $variables['grddl_profile'] = 'http://ns.inria.fr/grddl/rdfa/';
+ $variables['language'] = $GLOBALS['language'];
+ $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
+
+ $variables['classes_array'] = array_merge($variables['classes_array'], drupal_static('page_classes_array'));
+
+ // Add favicon.
+ if (theme_get_setting('toggle_favicon')) {
+ $favicon = theme_get_setting('favicon');
+ $type = file_get_mimetype($favicon);
+ // Use the genereic MIME type for favicons if no other was found.
+ if ($type == 'application/octet-stream') {
+ $type = 'image/x-icon';
+ }
+ drupal_add_html_head('');
+ }
+
+ // Construct page title.
+ if (drupal_get_title()) {
+ $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
+ }
+ else {
+ $head_title = array(variable_get('site_name', 'Drupal'));
+ if (variable_get('site_slogan', '')) {
+ $head_title[] = variable_get('site_slogan', '');
+ }
+ }
+ $variables['head_title'] = implode(' | ', $head_title);
+ // Closure should be filled last.
+ $variables['closure'] = theme('closure');
+}
+
+/**
* Preprocess variables for page.tpl.php
*
* Most themes utilize their own copy of page.tpl.php. The default is located
@@ -1899,17 +1944,6 @@
$variables['show_blocks'] = $variables['page']['#show_blocks'];
$variables['show_messages'] = $variables['page']['#show_messages'];
- // Add favicon.
- if (theme_get_setting('toggle_favicon')) {
- $favicon = theme_get_setting('favicon');
- $type = file_get_mimetype($favicon);
- // Use the genereic MIME type for favicons if no other was found.
- if ($type == 'application/octet-stream') {
- $type = 'image/x-icon';
- }
- drupal_add_html_head('');
- }
-
// Set up layout variable.
$variables['layout'] = 'none';
if (!empty($variables['page']['left'])) {
@@ -1919,23 +1953,10 @@
$variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right';
}
- // Construct page title
- if (drupal_get_title()) {
- $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
- }
- else {
- $head_title = array(variable_get('site_name', 'Drupal'));
- if (variable_get('site_slogan', '')) {
- $head_title[] = variable_get('site_slogan', '');
- }
- }
- $variables['head_title'] = implode(' | ', $head_title);
$variables['base_path'] = base_path();
$variables['front_page'] = url();
$variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb());
$variables['feed_icons'] = drupal_get_feeds();
- $variables['language'] = $GLOBALS['language'];
- $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
$variables['logo'] = theme_get_setting('logo');
$variables['messages'] = $variables['show_messages'] ? theme('status_messages') : '';
$variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
@@ -1945,13 +1966,6 @@
$variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
$variables['tabs'] = theme('menu_local_tasks');
$variables['title'] = drupal_get_title();
- // RDFa allows annotation of XHTML pages with RDF data, while GRDDL provides
- // mechanisms for extraction of this RDF content via XSLT transformation
- // using an associated GRDDL profile.
- $variables['rdf_namespaces'] = drupal_get_rdf_namespaces();
- $variables['grddl_profile'] = 'http://ns.inria.fr/grddl/rdfa/';
- // Closure should be filled last.
- $variables['closure'] = theme('closure');
if ($node = menu_get_object()) {
$variables['node'] = $node;
@@ -1993,23 +2007,22 @@
else {
$variables['classes_array'][] = 'one-sidebar sidebar-' . $variables['layout'];
}
+
+ // Store $classes_array for the html template.
+ // @see template_preprocess_html()
+ drupal_static('page_classes_array', $variables['classes_array']);
}
+
/**
- * Process variables for page.tpl.php
+ * Process variables for html.tpl.php
*
- * Perform final addition and modification of variables before passing into
- * the template. To customize these variables, call drupal_render() on elements
- * in $variables['page'] during THEME_preprocess_page().
+ * Perform final addition and modification of variables before passing into
+ * the template.
*
- * @see template_preprocess_page()
- * @see page.tpl.php
+ * @see template_preprocess_html()
+ * @see html.tpl.php
*/
-function template_process_page(&$variables) {
- // Render each region into top level variables.
- foreach (system_region_list($GLOBALS['theme']) as $region_key => $region_name) {
- $variables[$region_key] = drupal_render($variables['page'][$region_key]);
- }
-
+function template_process_html(&$variables) {
$variables['head'] = drupal_get_html_head();
$variables['css'] = drupal_add_css();
$variables['styles'] = drupal_get_css();
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.22
diff -u -r1.22 template.php
--- themes/garland/template.php 2 Jun 2009 03:57:22 -0000 1.22
+++ themes/garland/template.php 8 Jul 2009 16:15:38 -0000
@@ -33,7 +33,7 @@
$vars['tabs2'] = menu_secondary_local_tasks();
$vars['primary_nav'] = isset($vars['main_menu']) ? theme('links', $vars['main_menu'], array('class' => 'links main-menu')) : FALSE;
$vars['secondary_nav'] = isset($vars['secondary_menu']) ? theme('links', $vars['secondary_menu'], array('class' => 'links secondary-menu')) : FALSE;
- $vars['ie_styles'] = garland_get_ie_styles();
+ drupal_add_html_head('');
// Prepare header
$site_fields = array();
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.28
diff -u -r1.28 page.tpl.php
--- themes/garland/page.tpl.php 4 Jul 2009 05:21:15 -0000 1.28
+++ themes/garland/page.tpl.php 8 Jul 2009 16:15:38 -0000
@@ -1,27 +1,14 @@
->
-
- <?php print $head_title ?>
-
-
-
-
-
-
+?>
-
+
-
+
-
+
@@ -42,39 +29,35 @@
-
+
-
+
-
+
>
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.3
diff -u -r1.3 toolbar.module
--- modules/toolbar/toolbar.module 7 Jul 2009 07:54:35 -0000 1.3
+++ modules/toolbar/toolbar.module 8 Jul 2009 16:15:38 -0000
@@ -35,7 +35,7 @@
*
* Add admin toolbar to the page_top region automatically.
*/
-function toolbar_page_alter(&$page) {
+function toolbar_html_alter(&$page) {
if (user_access('access toolbar')) {
$page['page_top']['toolbar'] = toolbar_build();
}
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.348
diff -u -r1.348 block.module
--- modules/block/block.module 5 Jul 2009 18:00:07 -0000 1.348
+++ modules/block/block.module 8 Jul 2009 16:15:34 -0000
@@ -240,6 +240,7 @@
// Load all region content assigned via blocks.
foreach (array_keys($regions) as $region) {
+ $page[$region] = array();
// Prevent left and right regions from rendering blocks when 'show_blocks' == FALSE.
if (!empty($page['#show_blocks']) || ($region != 'left' && $region != 'right')) {
// Assign blocks to region.
Index: modules/system/html.tpl.php
===================================================================
RCS file: modules/system/html.tpl.php
diff -N modules/system/html.tpl.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/system/html.tpl.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,50 @@
+language contains its textual representation.
+ * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
+ * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document.
+ * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data.
+ * - $head_title: A modified version of the page title, for use in the TITLE tag.
+ * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
+ * so on).
+ * - $styles: Style tags necessary to import all CSS files for the page.
+ * - $scripts: Script tags necessary to load the JavaScript files and settings
+ * for the page.
+ * - $page: The rendered page content.
+ * - $closure: Final closing markup from any modules that have altered the page.
+ * This variable should always be output last, after all other dynamic content.
+ * - $classes String of classes that can be used to style contextually through
+ * CSS.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_html()
+ * @see template_process()
+ * @see page.tpl.php
+ */
+?>
+
+
+>
+
+
+ <?php print $head_title ?>
+
+
+
+
+
+
+
+
+