diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 1ecd819..bc78168 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -936,7 +936,7 @@ function install_display_output($output, $install_state) { // Let the theming function know when every step of the installation has // been completed. $active_task = $install_state['installation_finished'] ? NULL : $install_state['active_task']; - drupal_add_region_content('sidebar_first', theme('task_list', array('items' => install_tasks_to_display($install_state), 'active' => $active_task))); + drupal_add_region_content('sidebar_first', theme('task_list', array('items' => install_tasks_to_display($install_state), 'active' => $active_task, 'variant' => 'install'))); } print theme('install_page', array('content' => $output)); exit; diff --git a/core/includes/install.inc b/core/includes/install.inc index 1abb0f8..b0ca296 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -95,7 +95,7 @@ function drupal_install_profile_distribution_name() { // installation state (it might not be saved anywhere yet). if (drupal_installation_attempted()) { global $install_state; - return $install_state['profile_info']['distribution_name']; + return isset($install_state['profile_info']['distribution_name']) ? $install_state['profile_info']['distribution_name'] : 'Drupal'; } // At all other times, we load the profile via standard methods. else { diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 45737c5..12388aa 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -3047,6 +3047,40 @@ function template_process_maintenance_page(&$variables) { } /** + * Prepares variables for install page templates. + * + * Default template: install-page.html.twig. + * + * The variables array generated here is a mirror of + * template_preprocess_page(). This preprocessor will run its course when + * theme_install_page() is invoked. + * + * @param array $variables + * An associative array containing: + * - content - An array of page content. + * + * @see template_preprocess_maintenance_page() + * + */ +function template_preprocess_install_page(&$variables) { + template_preprocess_maintenance_page($variables); + // Override the site name that is displayed on the page, since Drupal is + // still in the process of being installed. + $variables['site_name'] = drupal_install_profile_distribution_name(); +} + +/** + * Preprocess variables for install-page.html.twig. + * + * @see install-page.html.twig + * @see template_process_html() + * + */ +function template_process_install_page(&$variables) { + template_process_maintenance_page($variables); +} + +/** * Preprocess variables for region.tpl.php * * Prepares the values passed to the theme_region function to be passed into a @@ -3152,10 +3186,11 @@ function drupal_common_theme() { 'template' => 'maintenance-page', ), 'install_page' => array( - 'variables' => array('content' => NULL), + 'variables' => array('content' => NULL, 'show_messages' => TRUE), + 'template' => 'install-page', ), 'task_list' => array( - 'variables' => array('items' => NULL, 'active' => NULL), + 'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL), ), 'authorize_message' => array( 'variables' => array('message' => NULL, 'success' => TRUE), diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc index 0077f88..e113371 100644 --- a/core/includes/theme.maintenance.inc +++ b/core/includes/theme.maintenance.inc @@ -115,16 +115,23 @@ function _theme_load_offline_registry($theme, $base_theme = NULL, $theme_engine * An associative array containing: * - items: An associative array of maintenance tasks. * - active: The key for the currently active maintenance task. + * - variant: A variant name to be used for a CSS class. * * @ingroup themeable */ function theme_task_list($variables) { $items = $variables['items']; $active = $variables['active']; + if (isset($variables['variant'])) { + $class = $variables['variant'] . '-task-list'; + } + else { + $class = 'task-list'; + } $done = isset($items[$active]) || $active == NULL; $output = ''; - $output .= '
    '; + $output .= '
      '; foreach ($items as $k => $item) { if ($active == $k) { @@ -147,20 +154,6 @@ function theme_task_list($variables) { } /** - * Returns HTML for the installation page. - * - * Note: this function is not themeable. - * - * @param $variables - * An associative array containing: - * - content: The page content to show. - */ -function theme_install_page($variables) { - drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); - return theme('maintenance_page', $variables); -} - -/** * Returns HTML for a results report of an operation run by authorize.php. * * @param $variables diff --git a/core/modules/system/css/system.maintenance.css b/core/modules/system/css/system.maintenance.css index ae3bc99..9fd9f38 100644 --- a/core/modules/system/css/system.maintenance.css +++ b/core/modules/system/css/system.maintenance.css @@ -43,10 +43,3 @@ #edit-connection-settings-change-connection-type { margin: 2.6em 0.5em 0 1em; } - -/** - * Installation task list - */ -.task-list li.active { - font-weight: bold; -} diff --git a/core/modules/system/templates/install-page.html.twig b/core/modules/system/templates/install-page.html.twig new file mode 100644 index 0000000..10fce35 --- /dev/null +++ b/core/modules/system/templates/install-page.html.twig @@ -0,0 +1,79 @@ +{# +/** + * @file + * Default theme implementation to display a Drupal installation page. + * + * All the available variables are mirrored in html.html.twig and + * page.html.twig. Some may be blank but they are provided for consistency. + * + * @see template_preprocess_install_page() + * + * @ingroup themeable + */ +#} + + + + {{ head_title }} + {{ head }} + {{ styles }} + {{ scripts }} + + +
      + + +
      + + {% if sidebar_first %} + + {% endif %} + +
      + +
      + {% if title %}

      {{ title }}

      {% endif %} + {% if messages %}{{ messages }}{% endif %} +
      + {{ content }} +
      +
      + +
      + + {% if sidebar_second %} + + {% endif %} + +
      + + + +
      + + diff --git a/core/themes/seven/images/noise-low.png b/core/themes/seven/images/noise-low.png new file mode 100644 index 0000000..105bee1 --- /dev/null +++ b/core/themes/seven/images/noise-low.png @@ -0,0 +1,30 @@ +PNG + + IHDR1|PLTEQ tRNS   +LwIDATx^7WcSܥl0L)KRƄ)f"S ϔ~/h\z^Q+ZĀ +lPohKa-cR1Bk؊lCk$RKQ f9?Kc~%Mu]T`W &E yva=Ӥ,K¼2Jq;Gd, +uHjVufPpnfX‰4p:k$5[U@j,vpPʁR?钕 +-sS .Kt _q/+v2mZN!ʪ*F@הn:9J1 j%ɪ2؊y\UXBڹ%6{hJXJ-=lcH9;g7bUӌ2X 77 4@Z\C+z"U##ďiGǗ.hjDV\ ?6S QU"J +tG9kMZ1mHGwޡ;%%CԢqfV>6UC`C:læ`Ilrhu3F9raKIUfr`io5IW͒Bj3+^9뱄Ak:c6K瞥I"UEP֖\z()=C!s_|:ѐ'Us8 м\= &.ag0x mGGH +Ph(uK;R[!fnMJUbu)2nQVa4{n<6ɶ0f0 %UP55AO|be,kjU՟#Pкjj¹=Ξn{3e.J|R[ z2$˜E!6ęՉpXGt7օI\ߩTEjsm=k!R8Uċ@M# `ᱜ;gZrX܀ Po:px+\BJ8Z GK =f19I$h-}%LJ b~!4@C/l—͈WAfPmk"MZX +:YP׹By~?Z)yCZ-a GC=UO NÜ]?-Ffo!d湻#¶dž_,1ݼQ->9=!YEHQّ0e8MzEf'p5; 3 +8o SxO< e})x]T N`Ѱ + N@%f; "t@3bhqޤ+9ϴ?5d4O9$Pݡ$tQÈ&[bQ: 6Mʌ)t+\ _˔gJ&k~~^9L ] ~ڰTsZS$OGCnymhu}0ԥP$v(_=raa;.mHE7MZʗ{;o#fc'8$3ؤ{z=9vj +̣mB̺4`Mv 8)}TlS[2|3K|>5NBC2jƿ!j #1--4Fv]oi(&QـcceC9uL3⫯_8/C RbcG OYD~+'B1ly3⎦v=A G/@{{ڙE'Bk|蹢ThGK/ג/Nf*W랜-Mj6+6טxi,M er;טw.58NJﵲ5m9cQHpvytFW߱hL-Bሌ"G ӊ4I+C-.X-"@7NI!pZu} bC^8(LQwN q ,w\*gc^y@/ 2er(/bKh>;^qU\ PzW* U!얘O@ ǝ&$@ԋ)|$$:!D<N@*u)zy`m^eG?DYƣW3MZU6sn3^]L#9^{kgboOT\"\pXK?[OO_hv^8<)T +骒"Gz.Ui_+Wy l=a yf԰t;}V_㫶|"wLWtMvB={*&뱘BZ"L_a9bQ-8'[|lnGUXe}LT}ajZ\4SVS\=DYxY2y0P1ߺ/h{'1rm +U7?#NrZZ* +mM `sBXmAY.c`1mm.-P"{{71޹ r|EYMq+b=`^_!Pok GhX?'3Vy[esJ-d8@gf u=7d-K1Ml`< V.h΋ib(UtЮUos[v@slvq{DamP}v.<[DfF +J%+{^RvTh4`Μi +(@tzudR)ԗr\$kw7ĂFg-}xK!cы[kCBr0) 8{}b_M>t+ҁ+AVr h}$SV0=M^._-dI7*GfQzXX7Js2<ܧ!VQXX7dc%t䣚DZf +i8';P[(t14kw623 +@9N ?Mbxvz8"&؆nvyRg} ޲Z|V_5 0"`_+8Na+i˜1I 'TJ\DkLw@B CSS_AGGREGATE_THEME)); } /** diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 86ac064..4db790a 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -914,7 +914,6 @@ body.in-maintenance #sidebar-first { } body.in-maintenance #content { float: right; /* LTR */ - max-width: 550px; clear: none; width: 72%; } @@ -953,41 +952,25 @@ body.in-maintenance #logo { width: auto; } } -ol.task-list { + +.task-list { margin-left: 0; /* LTR */ list-style-type: none; list-style-image: none; } -ol.task-list li { +.task-list li { padding: 0.5em 1em 0.5em 20px; /* LTR */ color: #adadad; } -ol.task-list li.active { +.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 { +.task-list li.done { background: transparent url(images/task-check.png) no-repeat 0 50%; color: green; } -body.in-maintenance #branding .step-indicator { - display: none; -} -@media all and (max-width: 768px) { - ol.task-list, - body.in-maintenance #logo { - display: none; - } - body.in-maintenance #branding h1 { - float: left; - width: auto; - } - body.in-maintenance #branding .step-indicator { - display: block; - float: right; - } -} /* Overlay theming */ .overlay #branding { @@ -1656,7 +1639,6 @@ details.fieldset-no-legend { } } - /** * Node form dropbuttons. */