bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrades core to 8.4.2

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2017-11-14 16:09:54 +01:00
parent bd60eff9b3
commit c2b4e25be4
3504 changed files with 140306 additions and 38684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/modules/layout_discovery/layout_discovery.info.yml
+4 -4
View File
@@ -1,12 +1,12 @@
name: 'Layout Discovery'
type: module
description: 'Provides a way for modules or themes to register layouts.'
package: Core (Experimental)
package: Core
# version: VERSION
# core: 8.x
# Information added by Drupal.org packaging script on 2017-08-16
version: '8.3.7'
# Information added by Drupal.org packaging script on 2017-11-03
version: '8.4.2'
core: '8.x'
project: 'drupal'
datestamp: 1502903957
datestamp: 1509719929
core/modules/layout_discovery/layout_discovery.module
+12 -1
View File
@@ -5,6 +5,9 @@
* Provides hook implementations for Layout Discovery.
*/
use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
/**
* Implements hook_help().
*/
@@ -13,7 +16,7 @@ function layout_discovery_help($route_name) {
case 'help.page.layout_discovery':
$output = '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('Layout Discovery allows modules or themes to register layouts, and for other modules to list the available layouts and render them.') . '</p>';
$output .= '<p>' . t('For more information, see the <a href=":layout-discovery-documentation">online documentation for the Layout Discovery module</a>.', [':layout-discovery-documentation' => 'https://www.drupal.org/node/2619128']) . '</p>';
$output .= '<p>' . t('For more information, see the <a href=":layout-discovery-documentation">online documentation for the Layout Discovery module</a>.', [':layout-discovery-documentation' => 'https://www.drupal.org/docs/8/api/layout-api']) . '</p>';
return $output;
}
}
@@ -36,4 +39,12 @@ function layout_discovery_theme() {
function template_preprocess_layout(&$variables) {
$variables['settings'] = isset($variables['content']['#settings']) ? $variables['content']['#settings'] : [];
$variables['layout'] = isset($variables['content']['#layout']) ? $variables['content']['#layout'] : [];
// Create an attributes variable for each region.
foreach (Element::children($variables['content']) as $name) {
if (!isset($variables['content'][$name]['#attributes'])) {
$variables['content'][$name]['#attributes'] = [];
}
$variables['region_attributes'][$name] = new Attribute($variables['content'][$name]['#attributes']);
}
}
core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
+1 -1
View File
@@ -18,7 +18,7 @@
%}
{% if content %}
<div{{ attributes.addClass(classes) }}>
<div class="layout__region layout__region--content">
<div {{ region_attributes.content.addClass('layout__region', 'layout__region--content') }}>
{{ content.content }}
</div>
</div>
core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
+5 -5
View File
@@ -22,31 +22,31 @@
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
<div {{ region_attributes.top.addClass('layout__region', 'layout__region--top') }}>
{{ content.top }}
</div>
{% endif %}
{% if content.first %}
<div class="layout__region layout__region--first">
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
{{ content.first }}
</div>
{% endif %}
{% if content.second %}
<div class="layout__region layout__region--second">
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
{{ content.second }}
</div>
{% endif %}
{% if content.third %}
<div class="layout__region layout__region--third">
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
{{ content.third }}
</div>
{% endif %}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
<div {{ region_attributes.bottom.addClass('layout__region', 'layout__region--bottom') }}>
{{ content.bottom }}
</div>
{% endif %}
core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
+5 -5
View File
@@ -22,31 +22,31 @@
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
<div {{ region_attributes.top.addClass('layout__region', 'layout__region--top') }}>
{{ content.top }}
</div>
{% endif %}
{% if content.first %}
<div class="layout__region layout__region--first">
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
{{ content.first }}
</div>
{% endif %}
{% if content.second %}
<div class="layout__region layout__region--second">
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
{{ content.second }}
</div>
{% endif %}
{% if content.third %}
<div class="layout__region layout__region--third">
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
{{ content.third }}
</div>
{% endif %}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
<div {{ region_attributes.bottom.addClass('layout__region', 'layout__region--bottom') }}>
{{ content.bottom }}
</div>
{% endif %}
core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
+4 -4
View File
@@ -19,25 +19,25 @@
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
<div {{ region_attributes.top.addClass('layout__region', 'layout__region--top') }}>
{{ content.top }}
</div>
{% endif %}
{% if content.first %}
<div class="layout__region layout__region--first">
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
{{ content.first }}
</div>
{% endif %}
{% if content.second %}
<div class="layout__region layout__region--second">
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
{{ content.second }}
</div>
{% endif %}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
<div {{ region_attributes.bottom.addClass('layout__region', 'layout__region--bottom') }}>
{{ content.bottom }}
</div>
{% endif %}
core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
+7 -7
View File
@@ -22,43 +22,43 @@
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
<div {{ region_attributes.top.addClass('layout__region', 'layout__region--top') }}>
{{ content.top }}
</div>
{% endif %}
{% if content.first_above %}
<div class="layout__region layout__region--first-above">
<div {{ region_attributes.first_above.addClass('layout__region', 'layout__region--first-above') }}>
{{ content.first_above }}
</div>
{% endif %}
{% if content.second_above %}
<div class="layout__region layout__region--second-above">
<div {{ region_attributes.second_above.addClass('layout__region', 'layout__region--second-above') }}>
{{ content.second_above }}
</div>
{% endif %}
{% if content.middle %}
<div class="layout__region layout__region--middle">
<div {{ region_attributes.middle.addClass('layout__region', 'layout__region--middle') }}>
{{ content.middle }}
</div>
{% endif %}
{% if content.first_below %}
<div class="layout__region layout__region--first-below">
<div {{ region_attributes.first_below.addClass('layout__region', 'layout__region--first-below') }}>
{{ content.first_below }}
</div>
{% endif %}
{% if content.second_below %}
<div class="layout__region layout__region--second-below">
<div {{ region_attributes.second_below.addClass('layout__region', 'layout__region--second-below') }}>
{{ content.second_below }}
</div>
{% endif %}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
<div {{ region_attributes.bottom.addClass('layout__region', 'layout__region--bottom') }}>
{{ content.bottom }}
</div>
{% endif %}
core/modules/layout_discovery/templates/layout.html.twig
+1 -1
View File
@@ -14,7 +14,7 @@
<div{{ attributes.addClass(classes) }}>
{% for region in layout.getRegionNames %}
{% if content[region] %}
<div class="{{ 'layout__region layout__region--' ~ region|clean_class }}">
<div {{ region_attributes[region].addClass('layout__region', 'layout__region--' ~ region|clean_class) }}>
{{ content[region] }}
</div>
{% endif %}
core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php
+14 -14
View File
@@ -82,7 +82,7 @@ class LayoutTest extends KernelTestBase {
public function renderLayoutData() {
$html = [];
$html[] = '<div data-drupal-selector="edit-layout" class="layout layout--onecol">';
$html[] = '<div class="layout__region layout__region--content">';
$html[] = '<div data-drupal-selector="edit-content" class="layout__region layout__region--content">';
$html[] = 'This is the content';
$html[] = '</div>';
$html[] = '</div>';
@@ -98,11 +98,11 @@ class LayoutTest extends KernelTestBase {
];
$html = [];
$html[] = '<div class="layout-example-1col clearfix">';
$html[] = '<div class="region-top">';
$html[] = '<div data-drupal-selector="edit-layout" class="layout-example-1col clearfix">';
$html[] = '<div data-drupal-selector="edit-top" class="region-top">';
$html[] = 'This string added by #process.';
$html[] = '</div>';
$html[] = '<div class="region-bottom">';
$html[] = '<div data-drupal-selector="edit-bottom" class="region-bottom">';
$html[] = 'This is the bottom';
$html[] = '</div>';
$html[] = '</div>';
@@ -121,11 +121,11 @@ class LayoutTest extends KernelTestBase {
];
$html = [];
$html[] = '<div class="layout-example-1col clearfix">';
$html[] = '<div class="region-top">';
$html[] = '<div data-drupal-selector="edit-layout" class="layout-example-1col clearfix">';
$html[] = '<div data-drupal-selector="edit-top" class="region-top">';
$html[] = 'This is the top';
$html[] = '</div>';
$html[] = '<div class="region-bottom">';
$html[] = '<div data-drupal-selector="edit-bottom" class="region-bottom">';
$html[] = 'This is the bottom';
$html[] = '</div>';
$html[] = '</div>';
@@ -145,10 +145,10 @@ class LayoutTest extends KernelTestBase {
$html = [];
$html[] = '<div data-drupal-selector="edit-layout" class="layout layout--layout-test-1col-no-template">';
$html[] = '<div class="layout__region layout__region--top">';
$html[] = '<div data-drupal-selector="edit-top" class="layout__region layout__region--top">';
$html[] = 'This is the top';
$html[] = '</div>';
$html[] = '<div class="layout__region layout__region--bottom">';
$html[] = '<div data-drupal-selector="edit-bottom" class="layout__region layout__region--bottom">';
$html[] = 'This is the bottom';
$html[] = '</div>';
$html[] = '</div>';
@@ -167,11 +167,11 @@ class LayoutTest extends KernelTestBase {
];
$html = [];
$html[] = '<div class="layout-example-2col clearfix">';
$html[] = '<div class="region-left">';
$html[] = '<div data-drupal-selector="edit-layout" class="layout-example-2col clearfix">';
$html[] = '<div data-drupal-selector="edit-left" class="class-added-by-preprocess region-left">';
$html[] = 'This is the left';
$html[] = '</div>';
$html[] = '<div class="region-right">';
$html[] = '<div data-drupal-selector="edit-right" class="region-right">';
$html[] = 'This is the right';
$html[] = '</div>';
$html[] = '</div>';
@@ -190,12 +190,12 @@ class LayoutTest extends KernelTestBase {
];
$html = [];
$html[] = '<div class="layout-test-plugin clearfix">';
$html[] = '<div data-drupal-selector="edit-layout" class="layout-test-plugin clearfix">';
$html[] = '<div>';
$html[] = '<span class="setting-1-label">Blah: </span>';
$html[] = 'Config value';
$html[] = '</div>';
$html[] = '<div class="region-main">';
$html[] = '<div data-drupal-selector="edit-main" class="region-main">';
$html[] = 'Main region';
$html[] = '</div>';
$html[] = '</div>';