Commit e19863b2 authored by Igor Biki's avatar Igor Biki
Browse files

Merge branch 'feature/ISTWCMS-5195-ebremner-node-theming' into '1.0.x'

Feature/istwcms 5195 ebremner node theming

See merge request !56
parents 02456945 23ba22da
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<div class="node--type-{{ node_type }}"> <div class="node--type-{{ node_type }}">
{% include '@components/card/card--node/card--node.twig' with { {% include '@components/card/card--node/card--node.twig' with {
'node': header_data, 'node': header_data,
'type': 'node',
'featured_image': featured_image, 'featured_image': featured_image,
} %} } %}
</div> </div>
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
<div class="layout uw-contained-width"> <div class="layout uw-contained-width">
{% include '@components/card/card--node/card--node.twig' with { {% include '@components/card/card--node/card--node.twig' with {
'node': footer_data, 'node': footer_data,
'type': 'footer', 'type': 'node',
} %} } %}
</div> </div>
{% endif %} {% endif %}
{% include '@components/card/card--teaser/card--teaser.twig' with { {% include '@components/card/card--teaser/card--teaser.twig' with {
'teaser': teaser, 'teaser': teaser,
'type': 'teaser'
} %} } %}
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<div{{ content_attributes.addClass('node__content') }}> <div{{ content_attributes.addClass('node__content') }}>
{% include '@components/card/card--node/card--node.twig' with { {% include '@components/card/card--node/card--node.twig' with {
'node': node_data, 'node': node_data,
'featured_image': featured_image, 'type': 'node'
} %} } %}
</div> </div>
{% endblock %} {% endblock %}
......
...@@ -350,6 +350,8 @@ function uw_fdsu_theme_resp_preprocess_node(&$variables) { ...@@ -350,6 +350,8 @@ function uw_fdsu_theme_resp_preprocess_node(&$variables) {
// The UW service object. // The UW service object.
$uwService = \Drupal::service('uw_cfg_common.uw_service'); $uwService = \Drupal::service('uw_cfg_common.uw_service');
$nodeContent = \Drupal::service('uw_cfg_common.uw_node_content');
// The types of nodes the need preprocessing. // The types of nodes the need preprocessing.
$nodes_to_preprocess = $uwService->uwGetNodePreprocessing('full'); $nodes_to_preprocess = $uwService->uwGetNodePreprocessing('full');
...@@ -361,21 +363,18 @@ function uw_fdsu_theme_resp_preprocess_node(&$variables) { ...@@ -361,21 +363,18 @@ function uw_fdsu_theme_resp_preprocess_node(&$variables) {
if (in_array($variables['node']->getType(), $nodes_to_preprocess) || if (in_array($variables['node']->getType(), $nodes_to_preprocess) ||
in_array($variables['node']->getType(), $teasers_to_preprocess)) { in_array($variables['node']->getType(), $teasers_to_preprocess)) {
// The UW service object.
$uwService = \Drupal::service('uw_cfg_common.uw_service');
// If on a teaser page get the variables for teaser. // If on a teaser page get the variables for teaser.
if ($variables['view_mode'] == 'teaser' && if ($variables['view_mode'] == 'teaser' &&
in_array($variables['node']->getType(), $teasers_to_preprocess)) { in_array($variables['node']->getType(), $teasers_to_preprocess)) {
$variables['teaser'] = $uwService->uwGetNodeContent($variables['node'], 'teaser', 'all'); $variables['teaser'] = $nodeContent->getNodeContent($variables['node'], 'teaser', 'all');
} }
// If on a node page get the variables for now. // If on a node page get the variables for now.
if ($variables['view_mode'] == 'full' && if ($variables['view_mode'] == 'full' &&
in_array($variables['node']->getType(), $nodes_to_preprocess)) { in_array($variables['node']->getType(), $nodes_to_preprocess
$variables['node_data'] = $uwService->uwGetNodeContent($variables['node'], 'full', 'all'); )) {
$variables['node_data'] = $nodeContent->getNodeContent($variables['node'], 'full', 'all');
$variables['node_data']['content'] = $variables['content']; $variables['node_data']['content'] = $variables['content'];
$variables['featured_image'] = $uwService->uwCheckNodeForFeaturedImage($variables['node']);
} }
// Unset the content variable, so that we do not get // Unset the content variable, so that we do not get
...@@ -489,6 +488,9 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) { ...@@ -489,6 +488,9 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) {
// The UW service object. // The UW service object.
$uwService = \Drupal::service('uw_cfg_common.uw_service'); $uwService = \Drupal::service('uw_cfg_common.uw_service');
// The UW node content service.
$uwNodeContent = \Drupal::service('uw_cfg_common.uw_node_content');
// The list of content types that will have header // The list of content types that will have header
// and footer in layout builder pages. // and footer in layout builder pages.
$content_types = $uwService->uwGetNodePreprocessing('layout_container'); $content_types = $uwService->uwGetNodePreprocessing('layout_container');
...@@ -510,8 +512,8 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) { ...@@ -510,8 +512,8 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) {
// If there is a node object, get the header and footer data. // If there is a node object, get the header and footer data.
if ($node) { if ($node) {
$variables['header_data'] = $uwService->uwGetNodeContent($node, 'teaser', 'header'); $variables['header_data'] = $uwNodeContent->getNodeContent($node, 'teaser', 'header');
$variables['footer_data'] = $uwService->uwGetNodeContent($node, 'teaser', 'footer'); $variables['footer_data'] = $uwNodeContent->getNodeContent($node, 'teaser', 'footer');
} }
} }
} }
......
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