Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.296 diff -u -p -u -p -r1.296 update.php --- update.php 11 Aug 2009 17:26:33 -0000 1.296 +++ update.php 18 Aug 2009 11:00:51 -0000 @@ -211,7 +211,7 @@ function update_info_page() { $output .= "
  • Install your new files in the appropriate location, as described in the handbook.
    • \n"; $output .= "\n"; $output .= "

    When you have performed the steps above, you may proceed.

    \n"; - $output .= '

    '; + $output .= '

    '; $output .= "\n"; return $output; } Index: includes/theme.maintenance.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v retrieving revision 1.34 diff -u -p -u -p -r1.34 theme.maintenance.inc --- includes/theme.maintenance.inc 4 Aug 2009 07:04:21 -0000 1.34 +++ includes/theme.maintenance.inc 18 Aug 2009 11:00:51 -0000 @@ -10,7 +10,7 @@ * Sets up the theming system for site installs, updates and when the site is * in maintenance mode. It also applies when the database is unavailable. * - * Minnelli is always used for the initial install and update operations. In + * Seven is always used for the initial install and update operations. In * other cases, "settings.php" must have a "maintenance_theme" key set for the * $conf variable in order to change the maintenance theme. */ @@ -33,7 +33,7 @@ function _drupal_maintenance_theme() { // Install and update pages are treated differently to prevent theming overrides. if (defined('MAINTENANCE_MODE') && (MAINTENANCE_MODE == 'install' || MAINTENANCE_MODE == 'update')) { - $theme = 'minnelli'; + $theme = 'seven'; } else { if (!db_is_active()) { @@ -46,7 +46,7 @@ function _drupal_maintenance_theme() { drupal_load('module', 'filter'); } - $theme = variable_get('maintenance_theme', 'minnelli'); + $theme = variable_get('maintenance_theme', 'seven'); } $themes = list_themes(); @@ -150,9 +150,9 @@ function theme_install_page($content) { // fix path_to_theme() for the template, to point at the actual // theme rather than system module as owner of the hook. global $theme_path; - $theme_path = 'themes/garland'; + $theme_path = 'themes/seven'; - return theme_render_template('themes/garland/maintenance-page.tpl.php', $variables); + return theme_render_template('themes/seven/maintenance-page.tpl.php', $variables); } /** @@ -191,9 +191,9 @@ function theme_update_page($content, $sh // fix path_to_theme() for the template, to point at the actual // theme rather than system module as owner of the hook. global $theme_path; - $theme_path = 'themes/garland'; + $theme_path = 'themes/seven'; - return theme_render_template('themes/garland/maintenance-page.tpl.php', $variables); + return theme_render_template('themes/seven/maintenance-page.tpl.php', $variables); } /** Index: themes/seven/maintenance-page.tpl.php =================================================================== RCS file: themes/seven/maintenance-page.tpl.php diff -N themes/seven/maintenance-page.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/seven/maintenance-page.tpl.php 18 Aug 2009 11:00:51 -0000 @@ -0,0 +1,46 @@ + + + + <?php print $head_title; ?> + + + + + + + + +
    +

    +
    + +
    + + + + + +
    + +
    + + +
    + +
    + + +
    + +
    + + + + + Index: themes/seven/seven.info =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/seven.info,v retrieving revision 1.1 diff -u -p -u -p -r1.1 seven.info --- themes/seven/seven.info 31 Jul 2009 19:35:57 -0000 1.1 +++ themes/seven/seven.info 18 Aug 2009 11:00:51 -0000 @@ -11,3 +11,5 @@ regions[content] = Content regions[help] = Help regions[page_top] = Page top regions[page_bottom] = Page bottom +regions[sidebar_first] = First sidebar +regions_hidden[] = sidebar_first Index: themes/seven/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/style.css,v retrieving revision 1.9 diff -u -p -u -p -r1.9 style.css --- themes/seven/style.css 12 Aug 2009 23:51:19 -0000 1.9 +++ themes/seven/style.css 18 Aug 2009 11:00:51 -0000 @@ -708,6 +708,58 @@ a.node-admin-add-content { border: none; } +/* Maintenance theming */ +body.in-maintenance #sidebar-first { + float: right; + width: 200px; +} +body.in-maintenance #content { + width: 550px; + padding-right: 20px; +} +body.in-maintenance #page { + width: 770px; + margin: 0 auto; + padding-top: 2em; +} +body.in-maintenance #branding h1 { + width: 770px; + margin: 0 auto; + float: none; +} + +body.in-maintenance .form-item-radio { + display: inline-block; +} +body.in-maintenance .form-submit { + display: block; +} + +body.in-maintenance #drupal-wordmark { + margin-bottom: 1.5em; +} + +ol.task-list { + margin-left: 0; /* LTR */ + list-style-type: none; + list-style-image: none; +} +ol.task-list li { + padding: 0.5em 1em 0.5em 0; /* LTR */ + color: #adadad; +} +ol.task-list li.active { + background: transparent url(images/task-item.png) no-repeat 3px 50%; /* LTR */ + padding: 0.5em 1em 0.5em 20px; /* LTR */ + color: #000; +} +ol.task-list li.done { + color: #393; + background: transparent url(images/task-check.png) no-repeat 0px 50%; /* LTR */ + padding: 0.5em 1em 0.5em 20px; /* LTR */ + color: green; +} + /* Overlay theming */ body.overlay { background: #fff; Index: themes/seven/images/task-check.png =================================================================== RCS file: themes/seven/images/task-check.png diff -N themes/seven/images/task-check.png Binary files /dev/null and task-check.png differ Index: themes/seven/images/task-item.png =================================================================== RCS file: themes/seven/images/task-item.png diff -N themes/seven/images/task-item.png Binary files /dev/null and task-item.png differ Index: themes/seven/images/wordmark.png =================================================================== RCS file: themes/seven/images/wordmark.png diff -N themes/seven/images/wordmark.png Binary files /dev/null and wordmark.png differ