diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-02-25 20:57:39 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-02-25 20:57:39 +0000 |
| commit | 96b9d512c3e037ded1b076e18fc4b6821e3485a5 (patch) | |
| tree | 36876bfc053ae5b6109648dd37a68312eee8e3cd /themes/garland | |
| parent | 6d7e7bb8a31910de2acf6b9e7dd8bb3eb2886dd2 (diff) | |
| download | brdo-96b9d512c3e037ded1b076e18fc4b6821e3485a5.tar.gz brdo-96b9d512c3e037ded1b076e18fc4b6821e3485a5.tar.bz2 | |
- Patch #228818 by effulgentsia, JonathanRoberts: IE stylesheets ignored after 31 link/style tags.
Diffstat (limited to 'themes/garland')
| -rw-r--r-- | themes/garland/maintenance-page.tpl.php | 3 | ||||
| -rw-r--r-- | themes/garland/template.php | 27 |
2 files changed, 8 insertions, 22 deletions
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php index 3f6ba9ca8..0a4e077ce 100644 --- a/themes/garland/maintenance-page.tpl.php +++ b/themes/garland/maintenance-page.tpl.php @@ -20,9 +20,6 @@ <?php print $head ?> <?php print $styles ?> <?php print $scripts ?> - <!--[if lt IE 7]> - <?php print garland_get_ie_styles(); ?> - <![endif]--> </head> <body class="<?php print $classes ?>"> diff --git a/themes/garland/template.php b/themes/garland/template.php index 630404a7e..f25b13cc2 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -25,10 +25,12 @@ function garland_breadcrumb($variables) { * Override or insert variables into the maintenance page template. */ function garland_preprocess_maintenance_page(&$vars) { - // Toggle fixed or fluid width. - if (theme_get_setting('garland_width') == 'fluid') { - $vars['classes_array'][] = 'fluid-width'; - } + // While markup for normal pages is split into page.tpl.php and html.tpl.php, + // the markup for the maintenance page is all in the single + // maintenance-page.tpl.php template. So, to have what's done in + // garland_preprocess_html() also happen on the maintenance page, it has to be + // called here. + garland_preprocess_html($vars); } /** @@ -39,6 +41,8 @@ function garland_preprocess_html(&$vars) { if (theme_get_setting('garland_width') == 'fluid') { $vars['classes_array'][] = 'fluid-width'; } + // Add conditional CSS for IE6. + drupal_add_css(path_to_theme() . '/fix-ie.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); } /** @@ -49,7 +53,6 @@ function garland_process_html(&$vars) { if (module_exists('color')) { _color_html_alter($vars); } - $vars['styles'] .= "\n<!--[if lt IE 7]>\n" . garland_get_ie_styles() . "<![endif]-->\n"; } /** @@ -136,17 +139,3 @@ function garland_preprocess_region(&$vars) { function garland_menu_local_tasks() { return menu_primary_local_tasks(); } - -/** - * Generates IE CSS links for LTR and RTL languages. - */ -function garland_get_ie_styles() { - global $language; - - $ie_styles = '<link type="text/css" rel="stylesheet" media="all" href="' . file_create_url(path_to_theme() . '/fix-ie.css') . '" />' . "\n"; - if ($language->direction == LANGUAGE_RTL) { - $ie_styles .= ' <style type="text/css" media="all">@import "' . file_create_url(path_to_theme() . '/fix-ie-rtl.css') . '";</style>' . "\n"; - } - - return $ie_styles; -} |