diff --git includes/theme.maintenance.inc includes/theme.maintenance.inc
index fb4d5d5..a0d7191 100644
--- includes/theme.maintenance.inc
+++ includes/theme.maintenance.inc
@@ -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')) {
- $custom_theme = 'minnelli';
+ $custom_theme = 'seven';
}
else {
if (!db_is_active()) {
@@ -46,7 +46,7 @@ function _drupal_maintenance_theme() {
drupal_load('module', 'filter');
}
- $custom_theme = variable_get('maintenance_theme', 'minnelli');
+ $custom_theme = variable_get('maintenance_theme', 'seven');
}
$themes = list_themes();
@@ -165,9 +165,9 @@ function theme_install_page($variables) {
// 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);
}
/**
@@ -203,9 +203,9 @@ function theme_update_page($variables) {
// 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);
}
/**
diff --git modules/simpletest/tests/menu.test modules/simpletest/tests/menu.test
index 98b269b..a8ed7e0 100644
--- modules/simpletest/tests/menu.test
+++ modules/simpletest/tests/menu.test
@@ -60,7 +60,7 @@ class MenuIncTestCase extends DrupalWebTestCase {
// 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('seven/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'));
diff --git themes/seven/maintenance-page.tpl.php themes/seven/maintenance-page.tpl.php
new file mode 100644
index 0000000..683b5f2
--- /dev/null
+++ themes/seven/maintenance-page.tpl.php
@@ -0,0 +1,46 @@
+
+
+
+ <?php print $head_title; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git themes/seven/seven.info themes/seven/seven.info
index eb45eb9..f540ea9 100644
--- themes/seven/seven.info
+++ themes/seven/seven.info
@@ -12,3 +12,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
diff --git themes/seven/style.css themes/seven/style.css
index 1040446..f2cc0da 100644
--- themes/seven/style.css
+++ themes/seven/style.css
@@ -715,6 +715,59 @@ div.admin-options div.form-item {
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-type-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;
diff --git update.php update.php
index f8a132c..6c7dc05 100644
--- update.php
+++ update.php
@@ -194,7 +194,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;
}
+
+