=== modified file 'includes/theme.maintenance.inc' --- includes/theme.maintenance.inc 2009-11-29 06:32:45 +0000 +++ includes/theme.maintenance.inc 2009-12-01 08:50:34 +0000 @@ -44,7 +44,7 @@ function _drupal_maintenance_theme() { drupal_load('module', 'system'); } - $custom_theme = variable_get('maintenance_theme', 'minnelli'); + $custom_theme = variable_get('maintenance_theme', 'garland'); } $themes = list_themes(); === modified file 'modules/simpletest/tests/menu.test' --- modules/simpletest/tests/menu.test 2009-12-01 00:39:34 +0000 +++ modules/simpletest/tests/menu.test 2009-12-01 08:50:34 +0000 @@ -60,7 +60,7 @@ class MenuIncTestCase extends DrupalWebT // For a regular user, the fact that the site is in maintenance mode means // we expect the theme callback system to be bypassed entirely. $this->drupalGet('menu-test/theme-callback/use-admin-theme'); - $this->assertRaw('minnelli/minnelli.css', t("The maintenance theme's CSS appears on the page.")); + $this->assertRaw('garland/style.css', t("The maintenance theme's CSS appears on the page.")); // An administrator, however, should continue to see the requested theme. $admin_user = $this->drupalCreateUser(array('access site in maintenance mode')); === modified file 'modules/system/system.admin.inc' --- modules/system/system.admin.inc 2009-12-01 00:39:34 +0000 +++ modules/system/system.admin.inc 2009-12-01 13:28:11 +0000 @@ -307,7 +307,7 @@ function system_themes_page() { // There are two possible theme groups. $theme_group_titles = array( 'enabled' => format_plural(count($theme_groups['enabled']), 'Enabled theme', 'Enabled themes'), - 'disabled' => format_plural(count($theme_groups['disabled']), 'Disabled theme', 'Disabled themes'), + 'disabled' => format_plural((!empty($theme_groups['disabled']) ? count($theme_groups['disabled']) : 0), 'Disabled theme', 'Disabled themes'), ); uasort($theme_groups['enabled'], 'system_sort_themes'); === modified file 'modules/system/system.install' --- modules/system/system.install 2009-11-11 17:06:30 +0000 +++ modules/system/system.install 2009-11-25 09:09:47 +0000 @@ -2767,6 +2767,46 @@ function system_update_7045() { } /** + * Switch from the Minnelli theme if it is the default or admin theme. + */ +function system_update_7046() { + if (variable_get('theme_default') == 'minnelli' || variable_get('admin_theme') == 'minnelli') { + // Make sure Garland is enabled. + db_update('system') + ->fields(array('status' => 1)) + ->condition('type', 'theme') + ->condition('name', 'garland') + ->execute(); + if (variable_get('theme_default') != 'garland') { + // If the default theme isn't Garland, transfer all of Minnelli's old + // settings to Garland. + $settings = variable_get('theme_minnelli_settings', array()); + // Set the theme setting width to "fixed" to match Minnelli's old layout. + $settings['garland_width'] = 'fixed'; + variable_set('theme_garland_settings', $settings); + // Remove Garland's color files since they won't match Minnelli's. + foreach (variable_get('color_garland_files', array()) as $file) { + @unlink($file); + } + if (isset($file) && $file = dirname($file)) { + @rmdir($file); + } + variable_del('color_garland_palette'); + variable_del('color_garland_stylesheets'); + variable_del('color_garland_logo'); + variable_del('color_garland_files'); + variable_del('color_garland_screenshot'); + } + if (variable_get('theme_default') == 'minnelli') { + variable_set('theme_default', 'garland'); + } + if (variable_get('admin_theme') == 'minnelli') { + variable_set('admin_theme', 'garland'); + } + } +} + +/** * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ === modified file 'sites/default/default.settings.php' --- sites/default/default.settings.php 2009-12-01 03:09:10 +0000 +++ sites/default/default.settings.php 2009-12-01 08:55:10 +0000 @@ -251,7 +251,7 @@ ini_set('session.cookie_lifetime', 20000 * Remove the leading hash signs to enable. */ # $conf['site_name'] = 'My Drupal site'; -# $conf['theme_default'] = 'minnelli'; +# $conf['theme_default'] = 'garland'; # $conf['anonymous'] = 'Visitor'; /** @@ -262,7 +262,7 @@ ini_set('session.cookie_lifetime', 20000 * theme. It is located inside 'modules/system/maintenance-page.tpl.php'. * Note: This setting does not apply to installation and update pages. */ -# $conf['maintenance_theme'] = 'minnelli'; +# $conf['maintenance_theme'] = 'garland'; /** * reverse_proxy accepts a boolean value. === modified file 'themes/garland/color/base.png' Binary files themes/garland/color/base.png 2006-10-29 13:17:37 +0000 and themes/garland/color/base.png 2009-11-18 08:15:13 +0000 differ === modified file 'themes/garland/color/preview.png' Binary files themes/garland/color/preview.png 2006-10-29 13:17:37 +0000 and themes/garland/color/preview.png 2009-12-01 08:50:27 +0000 differ === modified file 'themes/garland/garland.info' --- themes/garland/garland.info 2009-09-29 16:30:29 +0000 +++ themes/garland/garland.info 2009-12-01 08:50:27 +0000 @@ -1,9 +1,10 @@ ; $Id: garland.info,v 1.8 2009/09/29 16:30:29 webchick Exp $ name = Garland -description = Tableless, recolorable, multi-column, fluid width theme. +description = A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts. package = Core version = VERSION core = 7.x engine = phptemplate stylesheets[all][] = style.css stylesheets[print][] = print.css +settings[garland_width] = fluid === removed directory 'themes/garland/minnelli' === removed directory 'themes/garland/minnelli/color' === removed file 'themes/garland/minnelli/color/base.png' Binary files themes/garland/minnelli/color/base.png 2006-10-29 15:13:01 +0000 and themes/garland/minnelli/color/base.png 1970-01-01 00:00:00 +0000 differ === removed file 'themes/garland/minnelli/color/color.inc' --- themes/garland/minnelli/color/color.inc 2007-12-14 17:00:13 +0000 +++ themes/garland/minnelli/color/color.inc 1970-01-01 00:00:00 +0000 @@ -1,75 +0,0 @@ - array( - '#0072b9,#027ac6,#2385c2,#5ab5ee,#494949' => t('Blue Lagoon (Default)'), - '#464849,#2f416f,#2a2b2d,#5d6779,#494949' => t('Ash'), - '#55c0e2,#000000,#085360,#007e94,#696969' => t('Aquamarine'), - '#d5b048,#6c420e,#331900,#971702,#494949' => t('Belgian Chocolate'), - '#3f3f3f,#336699,#6598cb,#6598cb,#000000' => t('Bluemarine'), - '#d0cb9a,#917803,#efde01,#e6fb2d,#494949' => t('Citrus Blast'), - '#0f005c,#434f8c,#4d91ff,#1a1575,#000000' => t('Cold Day'), - '#c9c497,#0c7a00,#03961e,#7be000,#494949' => t('Greenbeam'), - '#ffe23d,#a9290a,#fc6d1d,#a30f42,#494949' => t('Mediterrano'), - '#788597,#3f728d,#a9adbc,#d4d4d4,#707070' => t('Mercury'), - '#5b5fa9,#5b5faa,#0a2352,#9fa8d5,#494949' => t('Nocturnal'), - '#7db323,#6a9915,#b5d52a,#7db323,#191a19' => t('Olivia'), - '#12020b,#1b1a13,#f391c6,#f41063,#898080' => t('Pink Plastic'), - '#b7a0ba,#c70000,#a1443a,#f21107,#515d52' => t('Shiny Tomato'), - '#18583d,#1b5f42,#34775a,#52bf90,#2d2d2d' => t('Teal Top'), - ), - - // Images to copy over. - 'copy' => array( - '../images/menu-collapsed.gif', - '../images/menu-collapsed-rtl.gif', - '../images/menu-expanded.gif', - '../images/menu-leaf.gif', - ), - - // CSS files (excluding @import) to rewrite with new color scheme. - 'css' => array( - '../style.css', - ), - - // Coordinates of gradient (x, y, width, height). - 'gradient' => array(0, 37, 760, 121), - - // Color areas to fill (x, y, width, height). - 'fill' => array( - 'base' => array(0, 0, 760, 568), - 'link' => array(107, 533, 41, 23), - ), - - // Coordinates of all the theme slices (x, y, width, height) - // with their filename as used in the stylesheet. - 'slices' => array( - '../images/body.png' => array(0, 37, 1, 280), - '../images/bg-bar.png' => array(202, 530, 76, 14), - '../images/bg-bar-white.png' => array(202, 506, 76, 14), - '../images/bg-tab.png' => array(107, 533, 41, 23), - '../images/bg-navigation.png' => array(0, 0, 7, 37), - '../images/bg-content-left.png' => array(40, 117, 50, 352), - '../images/bg-content-right.png' => array(510, 117, 50, 352), - '../images/bg-content.png' => array(299, 117, 7, 200), - '../images/bg-navigation-item.png' => array(32, 37, 17, 12), - '../images/bg-navigation-item-hover.png' => array(54, 37, 17, 12), - '../images/gradient-inner.png' => array(646, 307, 112, 42), - - 'logo.png' => array(622, 51, 64, 73), - 'screenshot.png' => array(0, 37, 400, 240), - ), - - // Reference color used for blending. Matches the base.png's colors. - 'blend_target' => '#ffffff', - - // Preview files. - 'preview_image' => 'color/preview.png', - 'preview_css' => '../color/preview.css', - - // Base file for image generation. - 'base_image' => 'color/base.png', -); === removed file 'themes/garland/minnelli/color/preview.png' Binary files themes/garland/minnelli/color/preview.png 2006-10-29 15:13:01 +0000 and themes/garland/minnelli/color/preview.png 1970-01-01 00:00:00 +0000 differ === removed file 'themes/garland/minnelli/logo.png' Binary files themes/garland/minnelli/logo.png 2006-10-29 13:17:37 +0000 and themes/garland/minnelli/logo.png 1970-01-01 00:00:00 +0000 differ === removed file 'themes/garland/minnelli/minnelli.css' --- themes/garland/minnelli/minnelli.css 2009-08-03 03:04:33 +0000 +++ themes/garland/minnelli/minnelli.css 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ -/* $Id: minnelli.css,v 1.7 2009/08/03 03:04:34 webchick Exp $ */ - -body #wrapper #container { - width: 560px; -} - -body.two-sidebars #wrapper #container { - width: 980px; -} - -body.sidebar-first #wrapper #container, -body.sidebar-second #wrapper #container { - width: 770px; -} === removed file 'themes/garland/minnelli/minnelli.info' --- themes/garland/minnelli/minnelli.info 2009-09-29 16:30:29 +0000 +++ themes/garland/minnelli/minnelli.info 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -; $Id: minnelli.info,v 1.9 2009/09/29 16:30:29 webchick Exp $ -name = Minnelli -description = Tableless, recolorable, multi-column, fixed width theme. -package = Core -version = VERSION -core = 7.x -base theme = garland -stylesheets[all][] = minnelli.css === removed file 'themes/garland/minnelli/screenshot.png' Binary files themes/garland/minnelli/screenshot.png 2009-12-01 00:39:34 +0000 and themes/garland/minnelli/screenshot.png 1970-01-01 00:00:00 +0000 differ === modified file 'themes/garland/style.css' --- themes/garland/style.css 2009-12-01 00:39:34 +0000 +++ themes/garland/style.css 2009-12-01 08:50:34 +0000 @@ -366,9 +366,24 @@ table .form-button, table .form-submit { background: #edf5fa url(images/body.png) repeat-x 50% 0; } +/* Set container widths when we are using the "fixed width" option. */ #wrapper #container { + width: 560px; margin: 0 auto; padding: 0 20px; +} + +body.one-sidebar #wrapper #container { + width: 770px; +} + +body.two-sidebars #wrapper #container { + width: 980px; +} + +/* Unset container width when we are using the "fluid width" option. */ +body.fluid-width #wrapper #container { + width: auto; max-width: 1270px; } === modified file 'themes/garland/template.php' --- themes/garland/template.php 2009-11-22 03:25:42 +0000 +++ themes/garland/template.php 2009-11-22 21:55:56 +0000 @@ -22,6 +22,26 @@ 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'; + } +} + +/** + * Override or insert variables into the html template. + */ +function garland_preprocess_html(&$vars) { + // Toggle fixed or fluid width. + if (theme_get_setting('garland_width') == 'fluid') { + $vars['classes_array'][] = 'fluid-width'; + } +} + +/** * Override or insert variables into the html template. */ function garland_process_html(&$vars) { === added file 'themes/garland/theme-settings.php' --- themes/garland/theme-settings.php 1970-01-01 00:00:00 +0000 +++ themes/garland/theme-settings.php 2009-12-01 08:50:27 +0000 @@ -0,0 +1,25 @@ + 'radios', + '#title' => t('Content width'), + '#options' => array( + 'fluid' => t('Fluid width'), + 'fixed' => t('Fixed width'), + ), + '#default_value' => theme_get_setting('garland_width'), + '#description' => t('Specify whether the content will wrap to a fixed width or will fluidly expand to the width of the browser window.'), + // Place this above the color scheme options. + '#weight' => -2, + ); +}