diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 0b25e59..bda1df2 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -991,7 +991,7 @@ function install_display_output($output, $install_state) { ); drupal_add_region_content('sidebar_first', drupal_render($task_list)); } - $install_page = array('#theme' => 'install_page', '#content' => $output); + $install_page = array('#theme' => 'maintenance_page', '#content' => $output); print drupal_render($install_page); exit; } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index f98aadd..f9a5188 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2496,29 +2496,11 @@ function template_preprocess_maintenance_page(&$variables) { if (!isset($variables['title'])) { $variables['title'] = drupal_get_title(); } -} - -/** - * 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 + // Override the site name if Drupal is // still in the process of being installed. - $variables['site_name'] = drupal_install_profile_distribution_name(); + if (drupal_installation_attempted()) { + $variables['site_name'] = drupal_install_profile_distribution_name(); + } } /** @@ -2629,10 +2611,6 @@ function drupal_common_theme() { 'variables' => array('content' => NULL, 'show_messages' => TRUE, 'page' => array()), 'template' => 'maintenance-page', ), - 'install_page' => array( - 'variables' => array('content' => NULL, 'show_messages' => TRUE), - 'template' => 'install-page', - ), 'task_list' => array( 'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL), ), diff --git a/core/modules/system/templates/install-page.html.twig b/core/modules/system/templates/install-page.html.twig deleted file mode 100644 index a462a5a..0000000 --- a/core/modules/system/templates/install-page.html.twig +++ /dev/null @@ -1,66 +0,0 @@ -{# -/** - * @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 }} - {{ head_title }} - {{ styles }} - {{ scripts }} - - - -
- -
- {% if site_name or site_slogan %} -
- {% if site_name %} -

{{ site_name }}

- {% endif %} - {% if site_slogan %} -
{{ site_slogan }}
- {% endif %} -
{# /.name-and-slogan #} - {% endif %} -
- -
- {% if title %} -

{{ title }}

- {% endif %} - {{ messages }} - {{ content }} -
- - {% if sidebar_first %} - {# /.l-sidebar-first #} - {% endif %} - - {% if sidebar_second %} - {# /.l-sidebar-second #} - {% endif %} - - {% if footer %} - - {% endif %} - - - diff --git a/core/themes/seven/install-page.html.twig b/core/themes/seven/install-page.html.twig deleted file mode 100644 index 1e9a1c2..0000000 --- a/core/themes/seven/install-page.html.twig +++ /dev/null @@ -1,69 +0,0 @@ -{# -/** - * @file - * Seven 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 }} - {{ head_title }} - {{ styles }} - {{ scripts }} - - - -
- -
- {% if site_name or site_slogan %} -
- {% if site_name %} -

{{ site_name }}

- {% endif %} - {% if site_slogan %} -
{{ site_slogan }}
- {% endif %} -
{# /.name-and-slogan #} - {% endif %} -
- - {% if sidebar_first %} - {# /.l-sidebar-first #} - {% endif %} - -
- {% if title %} -

{{ title }}

- {% endif %} - {{ messages }} - {{ content }} -
- - {% if sidebar_second %} - {# /.l-sidebar-second #} - {% endif %} - - {% if footer %} - - {% endif %} - -
{# /.l-container #} - - - diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 9db50d1..05ce5eb 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -212,22 +212,23 @@ function seven_element_info_alter(&$type) { } /** - * Implements hook_preprocess_install_page(). + * Implements hook_preprocess_maintenance_page(). */ -function seven_preprocess_install_page(&$variables) { - $variables['styles'] = new RenderWrapper('drupal_get_css'); - $variables['scripts'] = new RenderWrapper('drupal_get_js'); - - // Normally we could attach libraries via hook_page_alter(), but when the - // database is inactive it's not called so we add them here. - $libraries = array( - '#attached' => array( - 'library' => array( - array('seven', 'install-page'), +function seven_preprocess_maintenance_page(&$variables) { + // Since the install page uses the maintenance page template, + // add our install page libraries here. + if (drupal_installation_attempted()) { + // Normally we could attach libraries via hook_page_alter(), but when the + // database is inactive it's not called so we add them here. + $libraries = array( + '#attached' => array( + 'library' => array( + array('seven', 'install-page'), + ), ), - ), - ); - drupal_render($libraries); + ); + drupal_render($libraries); + } } /**