diff --git includes/theme.maintenance.inc includes/theme.maintenance.inc index c043ca8..98eaaaf 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')) { - $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(); @@ -160,9 +160,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); } /** @@ -198,7 +198,7 @@ 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 cf4d390..6ec6982 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/images/task-check.png themes/seven/images/task-check.png new file mode 100755 index 0000000000000000000000000000000000000000..9dcb0bc63e8ef2845d2a57cc75c8f8b0fa0c3ea0 GIT binary patch literal 1227 zcmV;+1T_1JP)4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@ z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt zw#riT4Se#lwS z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{A`0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9 zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q zzp3BRzh0>?G*mnz?orbizxjPhMHy6s|5~ zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKDSQAA9qOkFZ>Mwg%u5aOFKIN000Sa zNLh0L01FcU01FcV0GgZ_0003tNkl3M;4+IP(fKv|+Fl@fGjDZ29kr?pf_xJz( zdusk$bxHg`c6ZNzqBK7L`1pUs9Gm~<9ispD-`oPWhoHtQ&(8k$n56OFtV8(!wks>) zjst7_`|l520GV<6!J+>)-BMspAZH>229VVt6L(!(hb;d8!sFv`O(~1L{{Q;(6Gfg` z*I&Nj%%j5$`)+P#`1IoggQ>hN!;P008S+6RPjG_s|0c!*?TDIjgY`(k{#DoJ2MJI-d zVXNSLWCjzAQ{y#}!CNN+#${k(Vr3|G?S%8u8E}mt36N$Ftx&L4Tx0C)j~luKyTP!xv$j46V&f~d6?l;A>(v?V^!ics5Wwbqew82iv7$TV|j z8cj1XnHe95NI~5BT8bMVh>I%XLb_0Jr3;Zl>uXU2ait=NLN`*z|0eBBDpoHf`Et&G z&+CQ&RS#2+V?{Jz*v`AjuBdkC@PM{>0#&F%HMmlS=d>ph`+cTXKIgCLw@{>IvPs5@ z^&Ob_v~BhMOOImj>z?-dp85KDZ#6Cx0*XfKifq7JB@YI?SMtfclc(m0WMe3mCOhOt zw#riT4Se#lwS z#+8o&t!scqFDteI4;Z}*tXf~OHPits`+>1772D6GKOd!b+{A`0|qDVJm*eY<&{#wR+wXk~+^2z=p=Y+R=mX(oos*|%sGu!%-7M;7vjpTb7b5A$9 zf!9>V-P0SeveC?U_XHg2v#mJKMQS2-_F((~nei3X$w%cpB#(H-gEFRXKbG2;AlK8L zJf4e5O)dAfof+!k8A(>GGeaHmS$^#nk}~f)YVJ6e|IM?u$a5Tq1pyN_?>00f(S<0Q z;J`%=8G1}AOj@O1&}zcN@xLl9B+9!iD!TBQdp`SnPN2ZuGJYSTaf~#UBWU_N{hR(q zzp3BRzh0>?G*mnz?orbizxjPhMHy6s|5~ zU#Ty9G?_zOj8BKU6roH_7-T%zwd}q~w)iIed~?|rnjW<;&OWKDSQAA9qOkFZ>Mwg%u5aOFKIN000Sa zNLh0L01FcU01FcV0GgZ_0001ONklDLhzK= zc#tO;Xlax5BT(d=vDRXFLD-21VvHDLyhR$k_vpPJ!Px#07*qoM6N<$f`hf^ga7~l literal 0 HcmV?d00001 diff --git themes/seven/images/wordmark.png themes/seven/images/wordmark.png new file mode 100755 index 0000000000000000000000000000000000000000..43321bfeab2139186ddd0caeed504a636fb0b76f GIT binary patch literal 3021 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 P00000NkvXXu0mjfkte)R literal 0 HcmV?d00001 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 da85215..2f03fa6 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 e2d25a0..bf0c8a8 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 711fa0d..72d36a8 100644 --- update.php +++ update.php @@ -195,7 +195,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; }