Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.721 diff -u -r1.721 system.module --- modules/system/system.module 4 Jul 2009 18:26:42 -0000 1.721 +++ modules/system/system.module 4 Jul 2009 19:06:03 -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 4 Jul 2009 19:06:02 -0000 @@ -20,21 +20,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,41 +62,31 @@ * - $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; ?> - - - - - - - -
- -
+ +
+ +
+ +
+
Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.58 diff -u -r1.58 style.css --- themes/garland/style.css 20 Jun 2009 07:40:36 -0000 1.58 +++ themes/garland/style.css 4 Jul 2009 19:06:04 -0000 @@ -373,11 +373,11 @@ } /* With 3 columns, require a minimum width of 1000px to ensure there is enough horizontal space. */ -body.two-sidebars { +body .two-sidebars { min-width: 980px; } /* With 2 columns, require a minimum width of 800px. */ -body.sidebar-left, body.sidebar-right { +body .sidebar-left, body .sidebar-right { min-width: 780px; } @@ -388,24 +388,24 @@ } /* So we move the #center container over the sidebars to compensate */ -body.sidebar-left #center { +body .sidebar-left #center { margin-left: -210px; } -body.sidebar-right #center { +body .sidebar-right #center { margin-right: -210px; } -body.two-sidebars #center { +body .two-sidebars #center { margin: 0 -210px; } /* And add blanks left and right for the sidebars to fill */ -body.sidebar-left #squeeze { +body .sidebar-left #squeeze { margin-left: 210px; } -body.sidebar-right #squeeze { +body .sidebar-right #squeeze { margin-right: 210px; } -body.two-sidebars #squeeze { +body .two-sidebars #squeeze { margin: 0 210px; } @@ -486,15 +486,15 @@ z-index: 3; } -body.sidebar-left #footer { +body .sidebar-left #footer { margin-left: -210px; } -body.sidebar-right #footer { +body .sidebar-right #footer { margin-right: -210px; } -body.two-sidebars #footer { +body .two-sidebars #footer { margin: 0 -210px; } 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 4 Jul 2009 19:06:03 -0000 @@ -1,27 +1,15 @@ -> - - <?php print $head_title ?> - - - - - - +?> +
- +
- +
-
+
@@ -42,39 +30,37 @@
- +
-
+
>
- +
- +
- +
- +
- - - +
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 4 Jul 2009 19:06:01 -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 4 Jul 2009 19:06:01 -0000 @@ -1877,6 +1877,48 @@ $variables['classes'] = implode(' ', $variables['classes_array']); } + /** ++ * 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'; + + // 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 * @@ -1899,17 +1941,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,17 +1950,6 @@ $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()); @@ -1945,13 +1965,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; @@ -1995,21 +2008,15 @@ } } /** - * 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/stark/layout.css =================================================================== RCS file: /cvs/drupal/drupal/themes/stark/layout.css,v retrieving revision 1.2 diff -u -r1.2 layout.css --- themes/stark/layout.css 24 Feb 2009 17:50:22 -0000 1.2 +++ themes/stark/layout.css 4 Jul 2009 19:06:04 -0000 @@ -27,14 +27,14 @@ #content { width: 100%; } -body.sidebar-left #content { +body .sidebar-left #content { width: 80%; left: 20%; } -body.sidebar-right #content { +body .sidebar-right #content { width: 80%; } -body.two-sidebars #content { +body .two-sidebars #content { width: 60%; left: 20%; } @@ -44,7 +44,7 @@ left: -80%; } -body.two-sidebars #sidebar-left { +body .two-sidebars #sidebar-left { left: -60%; } Index: misc/tableheader.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tableheader.js,v retrieving revision 1.24 diff -u -r1.24 tableheader.js --- misc/tableheader.js 27 Apr 2009 20:19:35 -0000 1.24 +++ misc/tableheader.js 4 Jul 2009 19:06:02 -0000 @@ -81,8 +81,8 @@ // Only attach to scrollbars once, even if Drupal.attachBehaviors is called // multiple times. - if (!$('body').hasClass('tableHeader-processed')) { - $('body').addClass('tableHeader-processed'); + if (!$('body #body').hasClass('tableHeader-processed')) { + $('body #body').addClass('tableHeader-processed'); $(window).scroll(Drupal.tableHeaderDoScroll); $(document.documentElement).scroll(Drupal.tableHeaderDoScroll); } Index: misc/tabledrag.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tabledrag.js,v retrieving revision 1.29 diff -u -r1.29 tabledrag.js --- misc/tabledrag.js 10 Jun 2009 05:06:57 -0000 1.29 +++ misc/tabledrag.js 4 Jul 2009 19:06:02 -0000 @@ -217,7 +217,7 @@ $(item).addClass('drag'); // Set the document to use the move cursor during drag. - $('body').addClass('drag'); + $('body #body').addClass('drag'); if (self.oldRowElement) { $(self.oldRowElement).removeClass('drag-previous'); } @@ -478,7 +478,7 @@ $('.tabledrag-handle', droppedRow).removeClass('tabledrag-handle-hover'); self.dragObject = null; - $('body').removeClass('drag'); + $('body #body').removeClass('drag'); clearInterval(self.scrollInterval); // Hack for IE6 that flickers uncontrollably if select lists are moved. Index: modules/toolbar/toolbar.css =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.css,v retrieving revision 1.1 diff -u -r1.1 toolbar.css --- modules/toolbar/toolbar.css 4 Jul 2009 05:37:30 -0000 1.1 +++ modules/toolbar/toolbar.css 4 Jul 2009 19:06:03 -0000 @@ -1,10 +1,10 @@ /* $Id: toolbar.css,v 1.1 2009/07/04 05:37:30 dries Exp $ */ -body.toolbar { +body .toolbar { padding-top: 30px; } -body.toolbar-shortcuts { +body .toolbar-shortcuts { padding-top: 80px; } @@ -163,8 +163,8 @@ * Since IE 6 has severe problems interpreting fixed positioning, we downgrade * the behavior of the admin toolbar entirely to static positioning. */ -* html body.toolbar, -* html body.toolbar-shortcuts { +* html body .toolbar, +* html body .toolbar-shortcuts { padding-top: 0; } Index: modules/toolbar/toolbar.js =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.js,v retrieving revision 1.1 diff -u -r1.1 toolbar.js --- modules/toolbar/toolbar.js 4 Jul 2009 05:37:30 -0000 1.1 +++ modules/toolbar/toolbar.js 4 Jul 2009 19:06:03 -0000 @@ -52,7 +52,7 @@ Drupal.admin.toolbar.collapse = function() { $('#toolbar div.toolbar-shortcuts').addClass('collapsed'); $('#toolbar span.toggle').removeClass('toggle-active'); - $('body').removeClass('toolbar-shortcuts'); + $('body #body').removeClass('toolbar-shortcuts'); $.cookie( 'Drupal.admin.toolbar.collapsed', 1, @@ -66,7 +66,7 @@ Drupal.admin.toolbar.expand = function() { $('#toolbar div.toolbar-shortcuts').removeClass('collapsed'); $('#toolbar span.toggle').addClass('toggle-active'); - $('body').addClass('toolbar-shortcuts'); + $('body #body').addClass('toolbar-shortcuts'); $.cookie( 'Drupal.admin.toolbar.collapsed', 0, Index: themes/garland/minnelli/minnelli.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/minnelli/minnelli.css,v retrieving revision 1.6 diff -u -r1.6 minnelli.css --- themes/garland/minnelli/minnelli.css 28 Apr 2008 09:25:27 -0000 1.6 +++ themes/garland/minnelli/minnelli.css 4 Jul 2009 19:06:04 -0000 @@ -4,11 +4,11 @@ width: 560px; } -body.two-sidebars #wrapper #container { +body .two-sidebars #wrapper #container { width: 980px; } -body.sidebar-left #wrapper #container, -body.sidebar-right #wrapper #container { +body .sidebar-left #wrapper #container, +body .sidebar-right #wrapper #container { width: 770px; } Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.347 diff -u -r1.347 block.module --- modules/block/block.module 1 Jul 2009 08:04:19 -0000 1.347 +++ modules/block/block.module 4 Jul 2009 19:06:02 -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,47 @@ +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. + * + * @see template_preprocess() + * @see template_preprocess_html() + * @see template_process() + */ +?> + + +> + + + <?php print $head_title ?> + + + + + + + + +