commit 598d431c0b85a625fced454ab510898ecf253013 Author: Shane Auckland Date: Tue May 7 19:51:16 2013 +0100 1987426-new_changes diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 0d0e739..0c8f8f9 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -3029,18 +3029,19 @@ function theme_get_suggestions($args, $base, $delimiter = '__') { } /** - * Process variables for maintenance-page.tpl.php. + * Prepare variables for maintainence page templates. + * + * Default template: maintainence-page.html.twig. * * The variables array generated here is a mirror of * template_preprocess_page(). This preprocessor will run its course when * theme_maintenance_page() is invoked. An alternate template file of - * maintenance-page--offline.tpl.php can be used when the database is offline to - * hide errors and completely replace the content. - * - * The $variables array contains the following arguments: - * - $content + * maintenance-page--offline.html.twig can be used when the database is offline + * to hide errors and completely replace the content. * - * @see maintenance-page.tpl.php + * @param array $variables + * An associative array containing: + * - content - An array of page content. */ function template_preprocess_maintenance_page(&$variables) { global $theme; @@ -3137,7 +3138,7 @@ function template_preprocess_maintenance_page(&$variables) { * The variables array generated here is a mirror of template_process_html(). * This processor will run its course when theme_maintenance_page() is invoked. * - * @see maintenance-page.tpl.php + * @see maintenance-page.html.twig * @see template_process_html() */ function template_process_maintenance_page(&$variables) { diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index db034f9..55cc20a 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -495,7 +495,7 @@ function overlay_preprocess_html(&$variables) { } /** - * Implements hook_preprocess_HOOK() for maintenance-page.tpl.php. + * Implements hook_preprocess_HOOK() for maintenance-page.html.twig. * * If the current page request is inside the overlay, add appropriate classes * to the element, and simplify the page title. diff --git a/core/modules/system/templates/maintainance-page.html.twig b/core/modules/system/templates/maintainance-page.html.twig new file mode 100644 index 0000000..a57b546 --- /dev/null +++ b/core/modules/system/templates/maintainance-page.html.twig @@ -0,0 +1,92 @@ +{# +/** + * @file + * Default theme implementation to display a single Drupal page while offline. + * + * 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() + * @see template_preprocess_maintenance_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/modules/system/templates/maintainence-page.html.twig b/core/modules/system/templates/maintainence-page.html.twig deleted file mode 100644 index a57b546..0000000 --- a/core/modules/system/templates/maintainence-page.html.twig +++ /dev/null @@ -1,92 +0,0 @@ -{# -/** - * @file - * Default theme implementation to display a single Drupal page while offline. - * - * 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() - * @see template_preprocess_maintenance_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/bartik/bartik.theme b/core/themes/bartik/bartik.theme index 6245b4d..b508cb8 100644 --- a/core/themes/bartik/bartik.theme +++ b/core/themes/bartik/bartik.theme @@ -78,7 +78,7 @@ function bartik_process_page(&$variables) { } /** - * Implements hook_preprocess_HOOK() for maintenance-page.tpl.php. + * Implements hook_preprocess_HOOK() for maintenance-page.html.twig. */ function bartik_preprocess_maintenance_page(&$variables) { // By default, site_name is set to Drupal if no db connection is available @@ -92,7 +92,7 @@ function bartik_preprocess_maintenance_page(&$variables) { } /** - * Implements hook_process_HOOK() for maintenance-page.tpl.php. + * Implements hook_process_HOOK() for maintenance-page.html.twig. */ function bartik_process_maintenance_page(&$variables) { $site_config = config('system.site'); diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 61212fe..db521f5 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -6,12 +6,12 @@ */ /** - * Implements hook_preprocess_HOOK() for maintenance-page.tpl.php. + * Implements hook_preprocess_HOOK() for maintenance-page.html.twig. */ function seven_preprocess_maintenance_page(&$vars) { // While markup for normal pages is split into page.tpl.php and html.tpl.php, // the markup for the maintenance page is all in the single - // maintenance-page.tpl.php template. So, to have what's done in + // maintenance-page.html_twig template. So, to have what's done in // seven_preprocess_html() also happen on the maintenance page, it has to be // called here. seven_preprocess_html($vars);