The patch to use the seven administrative theme for install.php From: Adrian Rossouw --- includes/theme.maintenance.inc | 14 ++++----- misc/wordmark.png | Bin themes/seven/images/task-check.png | Bin themes/seven/images/task-item.png | Bin themes/seven/maintenance-page.tpl.php | 46 +++++++++++++++++++++++++++++ themes/seven/seven.info | 2 + themes/seven/style.css | 53 +++++++++++++++++++++++++++++++++ update.php | 2 + 8 files changed, 109 insertions(+), 8 deletions(-) create mode 100644 misc/wordmark.png create mode 100644 themes/seven/images/task-check.png create mode 100644 themes/seven/images/task-item.png create mode 100644 themes/seven/maintenance-page.tpl.php diff --git includes/theme.maintenance.inc includes/theme.maintenance.inc index 13ce6c4..bb722d4 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(); @@ -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, $show_messages = TRUE) { // 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 misc/wordmark.png misc/wordmark.png new file mode 100644 index 0000000000000000000000000000000000000000..6680e660f364d181cbdbe1c4855b97e2cef3be24 GIT binary patch literal 4014 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 UU9y8CMF0Q*07*qoM6N<$f@!7MHvj+t literal 0 HcmV?d00001 diff --git themes/seven/images/task-check.png themes/seven/images/task-check.png new file mode 100644 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/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 da9e494..0fd797f 100644 --- themes/seven/seven.info +++ themes/seven/seven.info @@ -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 diff --git themes/seven/style.css themes/seven/style.css index cb19967..7b703ea 100644 --- themes/seven/style.css +++ themes/seven/style.css @@ -707,6 +707,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 6638503..bdbda8c 100644 --- update.php +++ update.php @@ -189,7 +189,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; }