Skip to content

GitLab

D
drupal
Commit 8ec70c2e authored by alexpott's avatar alexpott
Browse files
Options

Issue #1961872 by Cottser, widukind, foopang, shanethehat, nikkubhai, c4rl,... 

Issue #1961872 by Cottser, widukind, foopang, shanethehat, nikkubhai, c4rl, thedavidmeister: Convert html.tpl.php to Twig.
parent af28766f
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 67 deletions
core/includes/theme.inc
View file @ 8ec70c2e
......@@ -2725,10 +2725,15 @@ function _template_preprocess_default_variables() {
}
/**
* Preprocess variables for html.tpl.php
* Prepares variables for HTML document templates.
*
* Default template: html.html.twig.
*
* @param array $variables
* An associative array containing:
* - page: A render element representing the page.
*
* @see system_elements()
* @see html.tpl.php
*/
function template_preprocess_html(&$variables) {
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
......@@ -2937,22 +2942,21 @@ function template_process_page(&$variables) {
}
/**
* Process variables for html.tpl.php
* Processes variables for html.html.twig.
*
* Perform final addition and modification of variables before passing into
* the template. To customize these variables, call drupal_render() on elements
* in $variables['page'] during THEME_preprocess_page().
*
* @see template_preprocess_html()
* @see html.tpl.php
*/
function template_process_html(&$variables) {
drupal_add_library('system', 'html5shiv', TRUE);
// Render page_top and page_bottom into top level variables.
$variables['page_top'] = drupal_render($variables['page']['page_top']);
$variables['page_bottom'] = drupal_render($variables['page']['page_bottom']);
$variables['page_top'] = isset($variables['page']['page_top']) ? drupal_render($variables['page']['page_top']) : '';
$variables['page_bottom'] = isset($variables['page']['page_bottom']) ? drupal_render($variables['page']['page_bottom']) : '';
// Place the rendered HTML for the page body into a top level variable.
$variables['page'] = $variables['page']['#children'];
$variables['page'] = $variables['page']['#children'];
$variables['page_bottom'] .= drupal_get_js('footer');
$variables['head'] = drupal_get_html_head();
......
core/modules/system/templates/html.html.twig 0 → 100644
View file @ 8ec70c2e
{#
/**
* @file
* Default theme implementation for the basic structure of a single Drupal page.
*
* Variables:
* - css: A list of CSS files for the current page.
* - head: Markup for the HEAD element (including meta tags, keyword tags, and
* so on).
* - head_title: A modified version of the page title, for use in the TITLE tag.
* - head_title_array: List of text elements that make up the head_title
* variable. May contain or more of the following:
* - title: The title of the page.
* - name: The name of the site.
* - slogan: The slogan of the site.
* - page_top: Initial rendered markup. This should be printed before 'page'.
* - page: The rendered page markup.
* - page_bottom: Closing rendered markup. This variable should be printed after
* 'page'.
* - styles: Style tags necessary to import all necessary CSS files in the head.
* - scripts: Script tags necessary to load the JavaScript files and settings
* in the head.
*
* @see template_preprocess()
* @see template_preprocess_html()
* @see template_process_html()
*
* @ingroup themeable
*/
#}
<!DOCTYPE html>
<html{{ html_attributes }}>
<head>
{{ head }}
<title>{{ head_title }}</title>
{{ styles }}
{{ scripts }}
</head>
<body{{ attributes }}>
<div id="skip-link">
<a href="#main-content" class="element-invisible element-focusable">
{{ 'Skip to main content'|t }}
</a>
</div>
{{ page_top }}
{{ page }}
{{ page_bottom }}
</body>
</html>
core/modules/system/templates/html.tpl.php deleted 100644 → 0
View file @ af28766f
<?php
/**
* @file
* Default theme implementation to display the basic html structure of a single
* Drupal page.
*
* Variables:
* - $css: An array of CSS files for the current page.
* - $language: (object) The language the site is being displayed in.
* $language->langcode contains its textual representation.
* $language->dir contains the language direction.
* It will either be 'ltr' or 'rtl'.
* - $head_title: A modified version of the page title, for use in the TITLE
* tag.
* - $head_title_array: (array) An associative array containing the string parts
* that were used to generate the $head_title variable, already prepared to be
* output as TITLE tag. The key/value pairs may contain one or more of the
* following, depending on conditions:
* - title: The title of the current page, if any.
* - name: The name of the site.
* - slogan: The slogan of the site, if any, and if there is no title.
* - $head: Markup for the HEAD section (including meta tags, keyword tags, and
* so on).
* - $styles: Style tags necessary to import all CSS files for the page.
* - $scripts: Script tags necessary to load the JavaScript files and settings
* for the page.
* - $page_top: Initial markup from any modules that have altered the
* page. This variable should always be output first, before all other dynamic
* content.
* - $page: The rendered page content.
* - $page_bottom: Final closing markup from any modules that have altered the
* page. This variable should always be output last, after all other dynamic
* content.
* - $classes String of classes that can be used to style contextually through
* CSS.
*
* @see template_preprocess()
* @see template_preprocess_html()
* @see template_process()
*
* @ingroup themeable
*/
?><!DOCTYPE html>
<html<?php print $html_attributes; ?>>
<head>
<?php print $head; ?>
<title><?php print $head_title; ?></title>
<?php print $styles; ?>
<?php print $scripts; ?>
</head>
<body class="<?php print $attributes['class']; ?>" <?php print $attributes;?>>
<div id="skip-link">
<a href="#main-content" class="element-invisible element-focusable"><?php print t('Skip to main content'); ?></a>
</div>
<?php print $page_top; ?>
<?php print $page; ?>
<?php print $page_bottom; ?>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment