From 1fce2de56235f214d4e86070057dcdcd0527d522 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 22 Apr 2022 12:27:02 +0200
Subject: [PATCH 01/46] OEL-1374: Remove badge underline.
---
.../oe_whitelabel_search.module | 25 +++++++++++++++++++
.../block--facets-summary-block.html.twig | 5 ++--
.../search/facets-summary-item-list.html.twig | 22 +++-------------
3 files changed, 32 insertions(+), 20 deletions(-)
create mode 100644 modules/oe_whitelabel_search/oe_whitelabel_search.module
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
new file mode 100644
index 00000000..731d8deb
--- /dev/null
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * OE Whitelabel Search Module.
+ */
+
+declare(strict_types = 1);
+
+/**
+ * Helper function to preprocess the facets_summary item list.
+ *
+ * @param array $variables
+ * Render array variables.
+ */
+function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variables) {
+ $variables['result_items'] = [];
+ foreach ($variables['items'] as $item) {
+ if ($item['value']['#type'] === 'link') {
+ $item['value']['#attributes']['class'] = 'standalone';
+ $variables['result_items'][] = $item;
+ }
+ }
+
+}
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index 52fd4812..bd0060d8 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -27,9 +27,10 @@
* @ingroup themeable
*/
#}
-{% if label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count' %}
+{% if label and content['#items'][0]['#theme'] is defined and content['#items'][1]['#theme'] == 'facets_summary_count' %}
+ {% set results_count = content['#items'][1] %}
+{% elseif label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count'%}
{% set results_count = content['#items'][0] %}
- {% set content = content['#items']|slice(1) %}
{% endif %}
{% block content %}
{% spaceless %}
diff --git a/templates/overrides/search/facets-summary-item-list.html.twig b/templates/overrides/search/facets-summary-item-list.html.twig
index 3419f8be..b97a9a1a 100755
--- a/templates/overrides/search/facets-summary-item-list.html.twig
+++ b/templates/overrides/search/facets-summary-item-list.html.twig
@@ -1,28 +1,14 @@
{#
/**
* @file
- * Default theme implementation for a facets summary item list.
+ * Theme implementation for a facets summary item list in oe_whitelabel.
*
- * Available variables:
- * - items: A list of items. Each item contains:
- * - attributes: HTML attributes to be applied to each list item.
- * - value: The content of the list element.
- * - title: The title of the list.
- * - list_type: The tag for list element ("ul" or "ol").
- * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
- * - attributes: HTML attributes to be applied to the list.
- * - empty: A message to display when there are no items. Allowed value is a
- * string or render array.
- * - context: A list of contextual data associated with the list. May contain:
- * - list_style: The custom list style.
+ * @see ./modules/contrib/facets/modules/facets_summary/templates/facets-summary-item-list.html
*
- * @see facets_summary_preprocess_facets_summary_item_list()
- *
- * @ingroup themeable
*/
#}
-{%- if items -%}
- {%- for item in items -%}
+{%- if result_items -%}
+ {%- for item in result_items -%}
{{ item.value }}
{%- endfor -%}
{%- else -%}
--
GitLab
From c350114ddfe7c879185c8defe3f26eb0e3788839 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 22 Apr 2022 15:35:14 +0200
Subject: [PATCH 02/46] OEL-1374: Add hr above pager.
---
.../search/views-view-unformatted.html.twig | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 templates/overrides/search/views-view-unformatted.html.twig
diff --git a/templates/overrides/search/views-view-unformatted.html.twig b/templates/overrides/search/views-view-unformatted.html.twig
new file mode 100644
index 00000000..23d70a35
--- /dev/null
+++ b/templates/overrides/search/views-view-unformatted.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme implementation to display showcase_search unformatted rows.
+ *
+ * @see ./core/modules/views/templates/views-view-unformatted.html.
+ */
+#}
+{% if view.current_display == 'showcase_search_page' %}
+ {% if title %}
+ <h3>{{ title }}</h3>
+ {% endif %}
+ {% for row in rows %}
+ {% set row_classes = [
+ default_row_class ? 'views-row',
+ ] %}
+ <div{{ row.attributes.addClass(row_classes) }}>
+ {{- row.content -}}
+ </div>
+ {% endfor %}
+{% endif %}
+<hr class="d-none d-md-block mt-4-5">
--
GitLab
From aabf68e996682c55d7f76dd25a88ed1fb6bfd2f2 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 25 Apr 2022 16:09:49 +0200
Subject: [PATCH 03/46] OEL-1374: Docblock improvement.
---
.../search/block--facets-form.html.twig | 27 ++-----------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/templates/overrides/search/block--facets-form.html.twig b/templates/overrides/search/block--facets-form.html.twig
index 3729c625..e9028b59 100644
--- a/templates/overrides/search/block--facets-form.html.twig
+++ b/templates/overrides/search/block--facets-form.html.twig
@@ -1,32 +1,9 @@
{#
/**
* @file
- * Default theme implementation to display a block.
+ * Theme block implementation to display facet form.
*
- * Available variables:
- * - plugin_id: The ID of the block implementation.
- * - label: The configured label of the block if visible.
- * - configuration: A list of the block's configuration values.
- * - label: The configured label for the block.
- * - label_display: The display settings for the label.
- * - provider: The module or other provider that provided this block plugin.
- * - Block plugin specific settings will also be stored here.
- * - content: The content of this block.
- * - attributes: array of HTML attributes populated by modules, intended to
- * be added to the main container tag of this template.
- * - id: A valid HTML ID and guaranteed unique.
- * - title_attributes: Same as attributes, except applied to the main title
- * tag that appears in the template.
- * - content_attributes: Same as attributes, except applied to the main content
- * tag that appears in the template.
- * - title_prefix: Additional output populated by modules, intended to be
- * displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- * displayed after the main title tag that appears in the template.
- *
- * @see template_preprocess_block()
- *
- * @ingroup themeable
+ * @see ./core/themes/stable/templates/block/block.html.twig
*/
#}
--
GitLab
From fe85a3b37932af06c0d8b6ee0cd9247712ddf34f Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 25 Apr 2022 16:11:35 +0200
Subject: [PATCH 04/46] OEL-1374: Theme the sort by bef form.
---
.../oe_whitelabel_search.module | 42 ++++++++++++++++++
oe_whitelabel.theme | 43 ++++++-------------
templates/overrides/page/page.html.twig | 4 +-
.../block--facets-summary-block.html.twig | 39 +++++------------
...case-search-showcase-search-page.html.twig | 13 ++++++
.../form-element--sort-by-bef.html.twig | 36 ++++++++++++++++
6 files changed, 117 insertions(+), 60 deletions(-)
create mode 100644 templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
create mode 100644 templates/overrides/search/form-element--sort-by-bef.html.twig
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index 731d8deb..732c0fc5 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -7,6 +7,38 @@
declare(strict_types = 1);
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements hook_form_FORM_ID_alter() for facets_forms.
+ */
+function oe_whitelabel_form_facets_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+ if (isset($form['actions'])) {
+ $action_classes = ['mt-4', 'd-grid', 'gap-4', 'd-md-block'];
+ foreach ($action_classes as $action_class) {
+ if (!isset($action_class, $form['actions']['#attributes']['class']) || !in_array($action_class, $form['actions']['#attributes']['class'], TRUE)) {
+ $form['actions']['#attributes']['class'][] = $action_class;
+ }
+ }
+ }
+ if (isset($form['actions']['submit'])) {
+ $submit_classes = ['me-md-3', 'btn', 'btn-primary', 'btn-md'];
+ foreach ($submit_classes as $submit_class) {
+ if (!isset($submit_class, $form['actions']['submit']['#attributes']['class']) || !in_array($submit_class, $form['actions']['submit']['#attributes']['class'], TRUE)) {
+ $form['actions']['submit']['#attributes']['class'][] = $submit_class;
+ }
+ }
+ }
+ if (isset($form['actions']['reset'])) {
+ $reset_classes = ['btn', 'btn-light', 'btn-md'];
+ foreach ($reset_classes as $reset_class) {
+ if (!isset($form['actions']['reset']['#attributes']['class']) || !in_array($reset_class, $form['actions']['reset']['#attributes']['class'], TRUE)) {
+ $form['actions']['reset']['#attributes']['class'][] = $reset_class;
+ }
+ }
+ }
+}
+
/**
* Helper function to preprocess the facets_summary item list.
*
@@ -23,3 +55,13 @@ function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variab
}
}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function oe_whitelabel_search_form_views_exposed_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+ if ($form['#id'] === 'views-exposed-form-showcase-search-showcase-search-page') {
+ $form['#inline_label'] = TRUE;
+ $form['sort_bef_combine']['#attributes']['class'][] = 'ms-md-2';
+ }
+}
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 6be05efd..0114a572 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -20,36 +20,6 @@ foreach (glob($includes_path) as $filename) {
require_once __DIR__ . '/includes/' . basename($filename);
}
-/**
- * Implements hook_form_FORM_ID_alter() for facets_forms.
- */
-function oe_whitelabel_form_facets_form_alter(&$form, FormStateInterface $form_state, $form_id) {
- if (isset($form['actions'])) {
- $action_classes = ['mt-4', 'd-grid', 'gap-4', 'd-md-block'];
- foreach ($action_classes as $action_class) {
- if (!isset($action_class, $form['actions']['#attributes']['class']) || !in_array($action_class, $form['actions']['#attributes']['class'], TRUE)) {
- $form['actions']['#attributes']['class'][] = $action_class;
- }
- }
- }
- if (isset($form['actions']['submit'])) {
- $submit_classes = ['me-md-3', 'btn', 'btn-primary', 'btn-md'];
- foreach ($submit_classes as $submit_class) {
- if (!isset($submit_class, $form['actions']['submit']['#attributes']['class']) || !in_array($submit_class, $form['actions']['submit']['#attributes']['class'], TRUE)) {
- $form['actions']['submit']['#attributes']['class'][] = $submit_class;
- }
- }
- }
- if (isset($form['actions']['reset'])) {
- $reset_classes = ['btn', 'btn-light', 'btn-md'];
- foreach ($reset_classes as $reset_class) {
- if (!isset($form['actions']['reset']['#attributes']['class']) || !in_array($reset_class, $form['actions']['reset']['#attributes']['class'], TRUE)) {
- $form['actions']['reset']['#attributes']['class'][] = $reset_class;
- }
- }
- }
-}
-
/**
* Implements hook_form_FORM_ID_alter().
*/
@@ -168,3 +138,16 @@ function oe_whitelabel_preprocess_media__document__default(&$variables) {
$variables['translations'][] = $wrapper->toFileValueObject();
}
}
+
+function oe_whitelabel_theme_suggestions_form_element_alter(array &$suggestions, array $variables) {
+ if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
+ $suggestions[] = 'form_element__sort_by_bef';
+ }
+}
+
+function oe_whitelabel_preprocess_form_element_label(&$variables) {
+ if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
+ $variables['attributes']['class'][] = 'mb-0';
+ }
+}
+
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index cd47a91a..e5041069 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -121,9 +121,9 @@
{% endif %}
{% if page.content or page.content_top %}
- <div class="col-12 {{ page.sidebar_left ? 'col-lg-9' }}">
+ <div class="col-12 {{ page.sidebar_left ? 'col-lg-9 col-xxl-8' }}">
{% if page.content_top %}
- <div class="mb-3 clearfix">
+ <div class="row">
{{ page.content_top }}
</div>
<hr class="d-none d-md-block mt-4 mb-4-75">
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index bd0060d8..6445f20c 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -1,30 +1,9 @@
{#
/**
* @file
- * Default theme implementation to display a block.
+ * Theme block implementation to display facets summary.
*
- * Available variables:
- * - plugin_id: The ID of the block implementation.
- * - label: The configured label of the block if visible.
- * - configuration: A list of the block's configuration values.
- * - label: The configured label for the block.
- * - label_display: The display settings for the label.
- * - provider: The module or other provider that provided this block plugin.
- * - Block plugin specific settings will also be stored here.
- * - content: The content of this block.
- * - attributes: array of HTML attributes populated by modules, intended to
- * be added to the main container tag of this template.
- * - id: A valid HTML ID and guaranteed unique.
- * - title_attributes: Same as attributes, except applied to the main title
- * tag that appears in the template.
- * - title_prefix: Additional output populated by modules, intended to be
- * displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- * displayed after the main title tag that appears in the template.
- *
- * @see template_preprocess_block()
- *
- * @ingroup themeable
+ * @see ./core/themes/stable/templates/block/block.html.twig
*/
#}
{% if label and content['#items'][0]['#theme'] is defined and content['#items'][1]['#theme'] == 'facets_summary_count' %}
@@ -36,12 +15,16 @@
{% spaceless %}
{{ title_prefix }}
{% if label %}
- <h4 class="mb-4">
- {{ label }}
- {{ results_count }}
- </h4>
+ <div class="col-md-6 col-lg-8 align-self-center">
+ <h4 class="mb-0">
+ {{ label }}
+ {{ results_count }}
+ </h4>
+ </div>
{% endif %}
{{ title_suffix }}
- {{ content }}
+ <div class="col-md-12 order-md-2 mt-3">
+ {{ content }}
+ </div>
{% endspaceless %}
{% endblock %}
diff --git a/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig b/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
new file mode 100644
index 00000000..37c440be
--- /dev/null
+++ b/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Theme block implementation to display sort by exposed filter form.
+ *
+ * @see ./core/themes/stable/templates/block/block.html.twig
+ */
+#}
+<div class="col-md-6 col-lg-4 mt-3 mt-md-0">
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</div>
diff --git a/templates/overrides/search/form-element--sort-by-bef.html.twig b/templates/overrides/search/form-element--sort-by-bef.html.twig
new file mode 100644
index 00000000..9603df6a
--- /dev/null
+++ b/templates/overrides/search/form-element--sort-by-bef.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme implementation for the bef sort by form element.
+ *
+ * @see ./core/themes/stable/templates/form/form-element.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'float-md-end',
+ 'd-md-flex',
+ 'align-items-center',
+ 'mb-4',
+ 'mb-md-0',
+ 'js-form-item',
+ 'mw-100',
+ 'form-item',
+ 'js-form-type-' ~ type|clean_class,
+ 'form-item-' ~ name|clean_class,
+ 'js-form-item-' ~ name|clean_class,
+ title_display not in ['after', 'before'] ? 'form-no-label',
+ disabled == 'disabled' ? 'form-disabled',
+ errors ? 'form-item--error',
+]
+%}
+
+<div{{ attributes.addClass(classes) }}>
+ <div class="text-nowrap"> {{ label }} </div>
+ {{ children }}
+{% if errors %}
+ <div class="form-item--error-message invalid-feedback d-block">
+ {{ errors }}
+ </div>
+{% endif %}
+</div>
--
GitLab
From 4ea51b41c494ab0243ab4665a5275e6e1b9a8b39 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 25 Apr 2022 17:42:41 +0200
Subject: [PATCH 05/46] OEL-1374: Fix sort by auto submit.
---
...ock--showcase-search-showcase-search-page.html.twig | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig b/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
index 37c440be..57a713eb 100644
--- a/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
+++ b/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
@@ -6,8 +6,8 @@
* @see ./core/themes/stable/templates/block/block.html.twig
*/
#}
-<div class="col-md-6 col-lg-4 mt-3 mt-md-0">
- {% block content %}
- {{ content }}
- {% endblock %}
-</div>
+{% block content %}
+ <div class="col-md-6 col-lg-4 mt-3 mt-md-0" data-bef-auto-submit-full-form="" data-bef-auto-submit="" data-bef-auto-submit-delay="500" data-drupal-selector="views-exposed-form-showcase-search-showcase-search-page" id="block-showcase-exposed-sort-form">
+ {{ content }}
+ </div>
+{% endblock %}
--
GitLab
From e8d731f56471c7fe8561af80af3b9dd14b485a2b Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 25 Apr 2022 17:54:20 +0200
Subject: [PATCH 06/46] OEL-1374: Improve docblock.
---
oe_whitelabel.theme | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 0114a572..161635c2 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -139,15 +139,20 @@ function oe_whitelabel_preprocess_media__document__default(&$variables) {
}
}
+/**
+ * Implements hook_theme_suggestions_HOOK_alter() for form_element.
+ */
function oe_whitelabel_theme_suggestions_form_element_alter(array &$suggestions, array $variables) {
if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
$suggestions[] = 'form_element__sort_by_bef';
}
}
+/**
+ * Helper function to preprocess sort by bef label.
+ */
function oe_whitelabel_preprocess_form_element_label(&$variables) {
if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
- $variables['attributes']['class'][] = 'mb-0';
- }
+ $variables['attributes']['class'][] = 'mb-0';
+ }
}
-
--
GitLab
From f13ca57ba2a83141cf2d210916822bce12e99b5a Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 25 Apr 2022 18:18:08 +0200
Subject: [PATCH 07/46] OEL-1374: Fix test and phpcs.
---
modules/oe_whitelabel_search/oe_whitelabel_search.module | 2 +-
oe_whitelabel.theme | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index 732c0fc5..3718b253 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -59,7 +59,7 @@ function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variab
/**
* Implements hook_form_FORM_ID_alter().
*/
-function oe_whitelabel_search_form_views_exposed_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function oe_whitelabel_search_form_views_exposed_form_alter(&$form, FormStateInterface $form_state, $form_id) {
if ($form['#id'] === 'views-exposed-form-showcase-search-showcase-search-page') {
$form['#inline_label'] = TRUE;
$form['sort_bef_combine']['#attributes']['class'][] = 'ms-md-2';
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 161635c2..ab75cc71 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -143,7 +143,7 @@ function oe_whitelabel_preprocess_media__document__default(&$variables) {
* Implements hook_theme_suggestions_HOOK_alter() for form_element.
*/
function oe_whitelabel_theme_suggestions_form_element_alter(array &$suggestions, array $variables) {
- if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
+ if (isset($variables['element']['#id']) && str_contains($variables['element']['#id'], 'sort-bef-combine')) {
$suggestions[] = 'form_element__sort_by_bef';
}
}
--
GitLab
From 5379a9a425cc96fd58252d42bfc087a876657c48 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 13:13:07 +0200
Subject: [PATCH 08/46] OEL-1374: Remove unused template.
---
...--showcase-search-showcase-search-page.html.twig | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
diff --git a/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig b/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
deleted file mode 100644
index 57a713eb..00000000
--- a/templates/overrides/search/block--views-exposed-filter-block--showcase-search-showcase-search-page.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{#
-/**
- * @file
- * Theme block implementation to display sort by exposed filter form.
- *
- * @see ./core/themes/stable/templates/block/block.html.twig
- */
-#}
-{% block content %}
- <div class="col-md-6 col-lg-4 mt-3 mt-md-0" data-bef-auto-submit-full-form="" data-bef-auto-submit="" data-bef-auto-submit-delay="500" data-drupal-selector="views-exposed-form-showcase-search-showcase-search-page" id="block-showcase-exposed-sort-form">
- {{ content }}
- </div>
-{% endblock %}
--
GitLab
From dbe6e9cdfd35c40fd58b1933f4ac0b9e79ba11fc Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 13:13:53 +0200
Subject: [PATCH 09/46] OEL-1374: Add column classes to float end sort widget.
---
.../Plugin/better_exposed_filters/sort/FloatEndSortWidget.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
index bd4d8965..816a746c 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
@@ -26,6 +26,10 @@ class FloatEndSortWidget extends DefaultWidget {
$form['#attributes']['class'][] = 'd-none';
$form['#attributes']['class'][] = 'd-md-flex';
$form['#attributes']['class'][] = 'align-items-baseline';
+ $form['#attributes']['class'][] = 'col-md-6';
+ $form['#attributes']['class'][] = 'col-lg-4';
+ $form['#attributes']['class'][] = 'mt-3';
+ $form['#attributes']['class'][] = 'mt-md-0';
}
}
--
GitLab
From d5fdf8fd2f7b23b1cf19004383f88ad6185d1e93 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 13:14:15 +0200
Subject: [PATCH 10/46] OEL-1374: Improve docblock.
---
modules/oe_whitelabel_search/oe_whitelabel_search.module | 2 +-
oe_whitelabel.theme | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index 3718b253..65394770 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -40,7 +40,7 @@ function oe_whitelabel_form_facets_form_alter(&$form, FormStateInterface $form_s
}
/**
- * Helper function to preprocess the facets_summary item list.
+ * Preprocess the facets_summary item list.
*
* @param array $variables
* Render array variables.
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index ab75cc71..343d7495 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -149,7 +149,7 @@ function oe_whitelabel_theme_suggestions_form_element_alter(array &$suggestions,
}
/**
- * Helper function to preprocess sort by bef label.
+ * Preprocess sort by bef form element label.
*/
function oe_whitelabel_preprocess_form_element_label(&$variables) {
if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
--
GitLab
From f9b594c46b3781ac3efd0300d67dcbff691a194d Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 13:14:54 +0200
Subject: [PATCH 11/46] OEL-1374: Remove facet count total extra code.
---
.../overrides/search/block--facets-summary-block.html.twig | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index 6445f20c..7e073c1b 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -6,9 +6,7 @@
* @see ./core/themes/stable/templates/block/block.html.twig
*/
#}
-{% if label and content['#items'][0]['#theme'] is defined and content['#items'][1]['#theme'] == 'facets_summary_count' %}
- {% set results_count = content['#items'][1] %}
-{% elseif label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count'%}
+{% if label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count'%}
{% set results_count = content['#items'][0] %}
{% endif %}
{% block content %}
@@ -17,7 +15,7 @@
{% if label %}
<div class="col-md-6 col-lg-8 align-self-center">
<h4 class="mb-0">
- {{ label }}
+ <span class="text-capitalize">{{ label }}</span>
{{ results_count }}
</h4>
</div>
--
GitLab
From 89c41df00e8bceda20b7acd606016a28f52856a2 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 13:15:16 +0200
Subject: [PATCH 12/46] OEL-1374: Change search page classes.
---
templates/overrides/page/page.html.twig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index e5041069..abfe5da7 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -115,7 +115,7 @@
{% endif %}
{% if page.sidebar_left %}
- <div class="col-md-3">
+ <div class="col-12 col-lg-3">
{{ page.sidebar_left }}
</div>
{% endif %}
@@ -126,7 +126,7 @@
<div class="row">
{{ page.content_top }}
</div>
- <hr class="d-none d-md-block mt-4 mb-4-75">
+ <hr class="d-none d-md-block mb-4-75">
{% endif %}
{{ page.content }}
--
GitLab
From c40288ff156a7f879be4a2c66dc40d43ca1fcfbd Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 16:03:58 +0200
Subject: [PATCH 13/46] OEL-1374: Extends pager to add hr.
---
templates/overrides/navigation/pager.html.twig | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100755 templates/overrides/navigation/pager.html.twig
diff --git a/templates/overrides/navigation/pager.html.twig b/templates/overrides/navigation/pager.html.twig
new file mode 100755
index 00000000..29f8f9bc
--- /dev/null
+++ b/templates/overrides/navigation/pager.html.twig
@@ -0,0 +1,11 @@
+{#
+/**
+ * @file
+ * Override for oe_bootstrap_theme 'pager' template.
+ */
+#}
+{% extends "@oe_bootstrap_theme/overrides/navigation/pager.html.twig" %}
+{% block pager %}
+ <hr class="d-none d-md-block mt-4-5">
+ {{ parent()}}
+{% endblock %}
--
GitLab
From f8ee66cde83403adf2ef9e75700ef66efcae557c Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 16:14:13 +0200
Subject: [PATCH 14/46] OEL-1374: Remove template.
---
.../form-element--sort-by-bef.html.twig | 36 -------------------
1 file changed, 36 deletions(-)
delete mode 100644 templates/overrides/search/form-element--sort-by-bef.html.twig
diff --git a/templates/overrides/search/form-element--sort-by-bef.html.twig b/templates/overrides/search/form-element--sort-by-bef.html.twig
deleted file mode 100644
index 9603df6a..00000000
--- a/templates/overrides/search/form-element--sort-by-bef.html.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-{#
-/**
- * @file
- * Theme implementation for the bef sort by form element.
- *
- * @see ./core/themes/stable/templates/form/form-element.html.twig
- */
-#}
-{%
- set classes = [
- 'float-md-end',
- 'd-md-flex',
- 'align-items-center',
- 'mb-4',
- 'mb-md-0',
- 'js-form-item',
- 'mw-100',
- 'form-item',
- 'js-form-type-' ~ type|clean_class,
- 'form-item-' ~ name|clean_class,
- 'js-form-item-' ~ name|clean_class,
- title_display not in ['after', 'before'] ? 'form-no-label',
- disabled == 'disabled' ? 'form-disabled',
- errors ? 'form-item--error',
-]
-%}
-
-<div{{ attributes.addClass(classes) }}>
- <div class="text-nowrap"> {{ label }} </div>
- {{ children }}
-{% if errors %}
- <div class="form-item--error-message invalid-feedback d-block">
- {{ errors }}
- </div>
-{% endif %}
-</div>
--
GitLab
From abfbf6542f7b6dc7afc214ec8a1b0776e650c12b Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 16:20:08 +0200
Subject: [PATCH 15/46] OEL-1374: Remove template.
---
.../search/views-view-unformatted.html.twig | 22 -------------------
1 file changed, 22 deletions(-)
delete mode 100644 templates/overrides/search/views-view-unformatted.html.twig
diff --git a/templates/overrides/search/views-view-unformatted.html.twig b/templates/overrides/search/views-view-unformatted.html.twig
deleted file mode 100644
index 23d70a35..00000000
--- a/templates/overrides/search/views-view-unformatted.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{#
-/**
- * @file
- * Theme implementation to display showcase_search unformatted rows.
- *
- * @see ./core/modules/views/templates/views-view-unformatted.html.
- */
-#}
-{% if view.current_display == 'showcase_search_page' %}
- {% if title %}
- <h3>{{ title }}</h3>
- {% endif %}
- {% for row in rows %}
- {% set row_classes = [
- default_row_class ? 'views-row',
- ] %}
- <div{{ row.attributes.addClass(row_classes) }}>
- {{- row.content -}}
- </div>
- {% endfor %}
-{% endif %}
-<hr class="d-none d-md-block mt-4-5">
--
GitLab
From bab895014aa89a1ed5359cba421e8eee80828118 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 17:50:03 +0200
Subject: [PATCH 16/46] OEL-1374: Remove unused functions.
---
oe_whitelabel.theme | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 343d7495..490f62a8 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -138,21 +138,3 @@ function oe_whitelabel_preprocess_media__document__default(&$variables) {
$variables['translations'][] = $wrapper->toFileValueObject();
}
}
-
-/**
- * Implements hook_theme_suggestions_HOOK_alter() for form_element.
- */
-function oe_whitelabel_theme_suggestions_form_element_alter(array &$suggestions, array $variables) {
- if (isset($variables['element']['#id']) && str_contains($variables['element']['#id'], 'sort-bef-combine')) {
- $suggestions[] = 'form_element__sort_by_bef';
- }
-}
-
-/**
- * Preprocess sort by bef form element label.
- */
-function oe_whitelabel_preprocess_form_element_label(&$variables) {
- if (str_contains($variables['element']['#id'], 'sort-bef-combine')) {
- $variables['attributes']['class'][] = 'mb-0';
- }
-}
--
GitLab
From 98eccb7c3513a85d677f2191eab9725363261130 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 17:51:11 +0200
Subject: [PATCH 17/46] OEL-1374: Remove unused functions and improve docblock.
---
.../oe_whitelabel_search.module | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index 65394770..e2d9a011 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -41,9 +41,6 @@ function oe_whitelabel_form_facets_form_alter(&$form, FormStateInterface $form_s
/**
* Preprocess the facets_summary item list.
- *
- * @param array $variables
- * Render array variables.
*/
function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variables) {
$variables['result_items'] = [];
@@ -55,13 +52,3 @@ function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variab
}
}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function oe_whitelabel_search_form_views_exposed_form_alter(&$form, FormStateInterface $form_state, $form_id) {
- if ($form['#id'] === 'views-exposed-form-showcase-search-showcase-search-page') {
- $form['#inline_label'] = TRUE;
- $form['sort_bef_combine']['#attributes']['class'][] = 'ms-md-2';
- }
-}
--
GitLab
From 98e02ad62908668c8c7c9501eab869c5d3a455ef Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 17:52:16 +0200
Subject: [PATCH 18/46] OEL-1374: Theme the sort form in the FloatEndSort
widget.
---
.../sort/FloatEndSortWidget.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
index 816a746c..abc379b5 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
@@ -22,14 +22,17 @@ class FloatEndSortWidget extends DefaultWidget {
*/
public function exposedFormAlter(array &$form, FormStateInterface $form_state) {
parent::exposedFormAlter($form, $form_state);
- $form['#attributes']['class'][] = 'float-lg-end';
- $form['#attributes']['class'][] = 'd-none';
- $form['#attributes']['class'][] = 'd-md-flex';
- $form['#attributes']['class'][] = 'align-items-baseline';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'float-md-end';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'd-md-flex';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'align-items-center';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'mb-4';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'mb-md-0';
$form['#attributes']['class'][] = 'col-md-6';
$form['#attributes']['class'][] = 'col-lg-4';
$form['#attributes']['class'][] = 'mt-3';
$form['#attributes']['class'][] = 'mt-md-0';
+ $form['sort_bef_combine']['#attributes']['class'][] = 'ms-md-2';
+ $form['sort_bef_combine']['#label_attributes']['class'][] = 'text-nowrap mb-0';
}
}
--
GitLab
From eb6207938fe762c2d224a768bfee935505e6b8f1 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 27 Apr 2022 18:00:48 +0200
Subject: [PATCH 19/46] OEL-1374: Add whitespace before total result.
---
.../overrides/search/block--facets-summary-block.html.twig | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index 7e073c1b..56cebccb 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -14,10 +14,7 @@
{{ title_prefix }}
{% if label %}
<div class="col-md-6 col-lg-8 align-self-center">
- <h4 class="mb-0">
- <span class="text-capitalize">{{ label }}</span>
- {{ results_count }}
- </h4>
+ <h4 class="mb-0"><span class="text-capitalize">{{ label }} </span> {{ results_count }}</h4>
</div>
{% endif %}
{{ title_suffix }}
--
GitLab
From 1fe5aa3958c60dd5ef276d8d54b3f6f4ef723da3 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 2 May 2022 09:08:56 +0200
Subject: [PATCH 20/46] OEL-1374: Improve docblock.
---
modules/oe_whitelabel_search/oe_whitelabel_search.module | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index e2d9a011..5faf654e 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -40,7 +40,7 @@ function oe_whitelabel_form_facets_form_alter(&$form, FormStateInterface $form_s
}
/**
- * Preprocess the facets_summary item list.
+ * Implements hook_preprocess_HOOK() for facet_summary_item_list.
*/
function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variables) {
$variables['result_items'] = [];
--
GitLab
From 6c1e6fe9ab8f5ea929226da4921c678297aff155 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Mon, 2 May 2022 14:35:58 +0200
Subject: [PATCH 21/46] OEL-1374: Fix test.
---
.../better_exposed_filters/sort/FloatEndSortWidgetTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php b/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
index 2b799fca..c6d341da 100644
--- a/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
+++ b/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
@@ -57,7 +57,7 @@ class FloatEndSortWidgetTest extends BetterExposedFiltersKernelTestBase {
$widget = $crawler->filter('form.bef-exposed-form');
$this->assertCount(1, $widget);
- $this->assertStringContainsString('float-lg-end d-none d-md-flex align-items-baseline', $widget->attr('class'));
+ $this->assertStringContainsString('col-md-6 col-lg-4 mt-3 mt-md-0', $widget->attr('class'));
$view->destroy();
}
--
GitLab
From ae10d42a014e3a2779d86701f8694be60e313f9d Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 11 May 2022 18:28:13 +0200
Subject: [PATCH 22/46] OEL-1374: No display facets summary wrapper if not
facets.
---
.../search/block--facets-summary-block.html.twig | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index 56cebccb..70a3bbdf 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -18,8 +18,10 @@
</div>
{% endif %}
{{ title_suffix }}
- <div class="col-md-12 order-md-2 mt-3">
- {{ content }}
- </div>
+ {% if content['#items'][1] is not empty %}
+ <div class="col-md-12 order-md-2 mt-3">
+ {{ content }}
+ </div>
+ {% endif %}
{% endspaceless %}
{% endblock %}
--
GitLab
From 68548cbe60c0eb63f15339876a3017553ce9dba7 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 11 May 2022 18:28:46 +0200
Subject: [PATCH 23/46] OEL-1374: Improve arrays. Fix function naming.
---
.../oe_whitelabel_search.module | 26 ++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index 5faf654e..6e33d630 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -12,37 +12,34 @@ use Drupal\Core\Form\FormStateInterface;
/**
* Implements hook_form_FORM_ID_alter() for facets_forms.
*/
-function oe_whitelabel_form_facets_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+function oe_whitelabel_search_form_facets_form_alter(&$form, FormStateInterface $form_state, $form_id): void {
if (isset($form['actions'])) {
$action_classes = ['mt-4', 'd-grid', 'gap-4', 'd-md-block'];
- foreach ($action_classes as $action_class) {
- if (!isset($action_class, $form['actions']['#attributes']['class']) || !in_array($action_class, $form['actions']['#attributes']['class'], TRUE)) {
- $form['actions']['#attributes']['class'][] = $action_class;
- }
+ if (!isset($form['actions']['#attributes']['class'])) {
+ $form['actions']['#attributes']['class'] = [];
}
+ $form['actions']['#attributes']['class'] = array_merge($form['actions']['#attributes']['class'], $action_classes);
}
if (isset($form['actions']['submit'])) {
$submit_classes = ['me-md-3', 'btn', 'btn-primary', 'btn-md'];
- foreach ($submit_classes as $submit_class) {
- if (!isset($submit_class, $form['actions']['submit']['#attributes']['class']) || !in_array($submit_class, $form['actions']['submit']['#attributes']['class'], TRUE)) {
- $form['actions']['submit']['#attributes']['class'][] = $submit_class;
- }
+ if (!isset($form['actions']['submit']['#attributes']['class'])) {
+ $form['actions']['submit']['#attributes']['class'] = [];
}
+ $form['actions']['submit']['#attributes']['class'] = array_merge($form['actions']['submit']['#attributes']['class'], $submit_classes);
}
if (isset($form['actions']['reset'])) {
$reset_classes = ['btn', 'btn-light', 'btn-md'];
- foreach ($reset_classes as $reset_class) {
- if (!isset($form['actions']['reset']['#attributes']['class']) || !in_array($reset_class, $form['actions']['reset']['#attributes']['class'], TRUE)) {
- $form['actions']['reset']['#attributes']['class'][] = $reset_class;
- }
+ if (!isset($form['actions']['reset']['#attributes']['class'])) {
+ $form['actions']['reset']['#attributes']['class'] = [];
}
+ $form['actions']['reset']['#attributes']['class'] = array_merge($form['actions']['reset']['#attributes']['class'], $reset_classes);
}
}
/**
* Implements hook_preprocess_HOOK() for facet_summary_item_list.
*/
-function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variables) {
+function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variables): void {
$variables['result_items'] = [];
foreach ($variables['items'] as $item) {
if ($item['value']['#type'] === 'link') {
@@ -50,5 +47,4 @@ function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variab
$variables['result_items'][] = $item;
}
}
-
}
--
GitLab
From 26777e2b4036afb0f619e6b48b7258d63b49397d Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 15:31:15 +0300
Subject: [PATCH 24/46] OEL-1374: Improve class injection in bef sort plugin.
---
.../sort/FloatEndSortWidget.php | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
index abc379b5..7322e2f2 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
@@ -22,17 +22,19 @@ class FloatEndSortWidget extends DefaultWidget {
*/
public function exposedFormAlter(array &$form, FormStateInterface $form_state) {
parent::exposedFormAlter($form, $form_state);
- $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'float-md-end';
- $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'd-md-flex';
- $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'align-items-center';
- $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'mb-4';
- $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'mb-md-0';
- $form['#attributes']['class'][] = 'col-md-6';
+
$form['#attributes']['class'][] = 'col-lg-4';
+ $form['#attributes']['class'][] = 'col-md-6';
$form['#attributes']['class'][] = 'mt-3';
$form['#attributes']['class'][] = 'mt-md-0';
$form['sort_bef_combine']['#attributes']['class'][] = 'ms-md-2';
- $form['sort_bef_combine']['#label_attributes']['class'][] = 'text-nowrap mb-0';
+ $form['sort_bef_combine']['#label_attributes']['class'][] = 'mb-0';
+ $form['sort_bef_combine']['#label_attributes']['class'][] = 'text-nowrap';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'align-items-center';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'd-md-flex';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'float-md-end';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'mb-4';
+ $form['sort_bef_combine']['#wrapper_attributes']['class'][] = 'mb-md-0';
}
}
--
GitLab
From a3a2525d9fc0bc1811a22a0d26ed0157a3d11149 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 15:31:47 +0300
Subject: [PATCH 25/46] OEL-1374: Add todo for improvement in bef sort plugin.
---
.../Plugin/better_exposed_filters/sort/FloatEndSortWidget.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
index 7322e2f2..7fa5449a 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
@@ -23,6 +23,7 @@ class FloatEndSortWidget extends DefaultWidget {
public function exposedFormAlter(array &$form, FormStateInterface $form_state) {
parent::exposedFormAlter($form, $form_state);
+ // @todo This will be done via theming in OEL-1583.
$form['#attributes']['class'][] = 'col-lg-4';
$form['#attributes']['class'][] = 'col-md-6';
$form['#attributes']['class'][] = 'mt-3';
--
GitLab
From 4fdc67970ec3bc70f5d73b8381e151392f42359c Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 15:32:49 +0300
Subject: [PATCH 26/46] OEL-1374: Revert to items in facets summary list.
---
modules/oe_whitelabel_search/oe_whitelabel_search.module | 5 +++--
.../overrides/search/facets-summary-item-list.html.twig | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.module b/modules/oe_whitelabel_search/oe_whitelabel_search.module
index 6e33d630..abd7c78c 100644
--- a/modules/oe_whitelabel_search/oe_whitelabel_search.module
+++ b/modules/oe_whitelabel_search/oe_whitelabel_search.module
@@ -40,11 +40,12 @@ function oe_whitelabel_search_form_facets_form_alter(&$form, FormStateInterface
* Implements hook_preprocess_HOOK() for facet_summary_item_list.
*/
function oe_whitelabel_search_preprocess_facets_summary_item_list(array &$variables): void {
- $variables['result_items'] = [];
+ $items = [];
foreach ($variables['items'] as $item) {
if ($item['value']['#type'] === 'link') {
$item['value']['#attributes']['class'] = 'standalone';
- $variables['result_items'][] = $item;
+ $items[] = $item;
}
}
+ $variables['items'] = $items;
}
diff --git a/templates/overrides/search/facets-summary-item-list.html.twig b/templates/overrides/search/facets-summary-item-list.html.twig
index b97a9a1a..96c61e9c 100755
--- a/templates/overrides/search/facets-summary-item-list.html.twig
+++ b/templates/overrides/search/facets-summary-item-list.html.twig
@@ -7,8 +7,8 @@
*
*/
#}
-{%- if result_items -%}
- {%- for item in result_items -%}
+{%- if items -%}
+ {%- for item in items -%}
{{ item.value }}
{%- endfor -%}
{%- else -%}
--
GitLab
From 7dfef3657a3618f0e2c0ee245423bda9763f3605 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 15:33:46 +0300
Subject: [PATCH 27/46] OEL-1374: Content always has count, remove if.
---
.../search/block--facets-summary-block.html.twig | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index 70a3bbdf..56cebccb 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -18,10 +18,8 @@
</div>
{% endif %}
{{ title_suffix }}
- {% if content['#items'][1] is not empty %}
- <div class="col-md-12 order-md-2 mt-3">
- {{ content }}
- </div>
- {% endif %}
+ <div class="col-md-12 order-md-2 mt-3">
+ {{ content }}
+ </div>
{% endspaceless %}
{% endblock %}
--
GitLab
From 62ee489cf0345f61c8d06e98958691e4aee6a38e Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 16:47:17 +0300
Subject: [PATCH 28/46] OEL-1374: Account for bef sort combine.
---
.../better_exposed_filters/sort/FloatEndSortWidget.php | 5 +++++
.../better_exposed_filters/sort/FloatEndSortWidgetTest.php | 1 +
2 files changed, 6 insertions(+)
diff --git a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
index 7fa5449a..c5adf794 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
@@ -28,6 +28,11 @@ class FloatEndSortWidget extends DefaultWidget {
$form['#attributes']['class'][] = 'col-md-6';
$form['#attributes']['class'][] = 'mt-3';
$form['#attributes']['class'][] = 'mt-md-0';
+
+ if (empty($form['sort_bef_combine'])) {
+ return;
+ }
+
$form['sort_bef_combine']['#attributes']['class'][] = 'ms-md-2';
$form['sort_bef_combine']['#label_attributes']['class'][] = 'mb-0';
$form['sort_bef_combine']['#label_attributes']['class'][] = 'text-nowrap';
diff --git a/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php b/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
index c6d341da..175098a8 100644
--- a/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
+++ b/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
@@ -46,6 +46,7 @@ class FloatEndSortWidgetTest extends BetterExposedFiltersKernelTestBase {
$view->storage->getDisplay('default');
$this->setBetterExposedOptions($view, [
+ // @todo Add combined sort.
'sort' => [
'plugin_id' => 'oe_whitelabel_float_end_sort',
],
--
GitLab
From 918a77c2f33b198497d569ef376b393d93bb321e Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 16:48:04 +0300
Subject: [PATCH 29/46] OEL-1374: Update classes assert.
---
.../better_exposed_filters/sort/FloatEndSortWidgetTest.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php b/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
index 175098a8..f9a2a901 100644
--- a/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
+++ b/modules/oe_whitelabel_helper/tests/src/Kernel/Plugin/better_exposed_filters/sort/FloatEndSortWidgetTest.php
@@ -55,10 +55,10 @@ class FloatEndSortWidgetTest extends BetterExposedFiltersKernelTestBase {
// Render the exposed form.
$this->renderExposedForm($view);
$crawler = new Crawler($this->content->__toString());
-
$widget = $crawler->filter('form.bef-exposed-form');
+
$this->assertCount(1, $widget);
- $this->assertStringContainsString('col-md-6 col-lg-4 mt-3 mt-md-0', $widget->attr('class'));
+ $this->assertStringContainsString('col-lg-4 col-md-6 mt-3 mt-md-0', $widget->attr('class'));
$view->destroy();
}
--
GitLab
From 4748a0df9701f3b3b1f7a5027a2b161eb6710cbf Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Thu, 12 May 2022 16:48:27 +0300
Subject: [PATCH 30/46] OEL-1374: Small formating fix.
---
.../overrides/search/block--facets-summary-block.html.twig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/overrides/search/block--facets-summary-block.html.twig b/templates/overrides/search/block--facets-summary-block.html.twig
index 56cebccb..d777df73 100644
--- a/templates/overrides/search/block--facets-summary-block.html.twig
+++ b/templates/overrides/search/block--facets-summary-block.html.twig
@@ -6,7 +6,7 @@
* @see ./core/themes/stable/templates/block/block.html.twig
*/
#}
-{% if label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count'%}
+{% if label and content['#items'][0]['#theme'] is defined and content['#items'][0]['#theme'] == 'facets_summary_count' %}
{% set results_count = content['#items'][0] %}
{% endif %}
{% block content %}
--
GitLab
From 95935af40a1067c586530d453f49fcc51774b1d1 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Thu, 5 May 2022 11:13:53 +0200
Subject: [PATCH 31/46] OEL-1528: Move templates from
oe_whitelabel_starter_news and oe_whitelabel_starter_event.
---
.../content}/field--node--body--oe-sc-event.html.twig | 0
.../content}/field--node--oe-documents--oe-sc-event.html.twig | 0
.../field--node--oe-publication-date--oe-sc-news.html.twig | 0
.../content}/node--oe-sc-event--full.html.twig | 0
.../content}/node--oe-sc-event--oe-w-content-banner.html.twig | 0
.../content}/node--oe-sc-event--teaser.html.twig | 0
.../content}/node--oe-sc-news--full.html.twig | 0
.../content}/node--oe-sc-news--oe-w-content-banner.html.twig | 0
.../content}/node--oe-sc-news--teaser.html.twig | 0
9 files changed, 0 insertions(+), 0 deletions(-)
rename {modules/oe_whitelabel_starter_event/templates => templates/content}/field--node--body--oe-sc-event.html.twig (100%)
rename {modules/oe_whitelabel_starter_event/templates => templates/content}/field--node--oe-documents--oe-sc-event.html.twig (100%)
rename {modules/oe_whitelabel_starter_news/templates => templates/content}/field--node--oe-publication-date--oe-sc-news.html.twig (100%)
rename {modules/oe_whitelabel_starter_event/templates => templates/content}/node--oe-sc-event--full.html.twig (100%)
rename {modules/oe_whitelabel_starter_event/templates => templates/content}/node--oe-sc-event--oe-w-content-banner.html.twig (100%)
rename {modules/oe_whitelabel_starter_event/templates => templates/content}/node--oe-sc-event--teaser.html.twig (100%)
rename {modules/oe_whitelabel_starter_news/templates => templates/content}/node--oe-sc-news--full.html.twig (100%)
rename {modules/oe_whitelabel_starter_news/templates => templates/content}/node--oe-sc-news--oe-w-content-banner.html.twig (100%)
rename {modules/oe_whitelabel_starter_news/templates => templates/content}/node--oe-sc-news--teaser.html.twig (100%)
diff --git a/modules/oe_whitelabel_starter_event/templates/field--node--body--oe-sc-event.html.twig b/templates/content/field--node--body--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_event/templates/field--node--body--oe-sc-event.html.twig
rename to templates/content/field--node--body--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_starter_event/templates/field--node--oe-documents--oe-sc-event.html.twig b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_event/templates/field--node--oe-documents--oe-sc-event.html.twig
rename to templates/content/field--node--oe-documents--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_starter_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig b/templates/content/field--node--oe-publication-date--oe-sc-news.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
rename to templates/content/field--node--oe-publication-date--oe-sc-news.html.twig
diff --git a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--full.html.twig b/templates/content/node--oe-sc-event--full.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--full.html.twig
rename to templates/content/node--oe-sc-event--full.html.twig
diff --git a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--oe-w-content-banner.html.twig b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--oe-w-content-banner.html.twig
rename to templates/content/node--oe-sc-event--oe-w-content-banner.html.twig
diff --git a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig b/templates/content/node--oe-sc-event--teaser.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
rename to templates/content/node--oe-sc-event--teaser.html.twig
diff --git a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--full.html.twig b/templates/content/node--oe-sc-news--full.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--full.html.twig
rename to templates/content/node--oe-sc-news--full.html.twig
diff --git a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--oe-w-content-banner.html.twig b/templates/content/node--oe-sc-news--oe-w-content-banner.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--oe-w-content-banner.html.twig
rename to templates/content/node--oe-sc-news--oe-w-content-banner.html.twig
diff --git a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig b/templates/content/node--oe-sc-news--teaser.html.twig
similarity index 100%
rename from modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
rename to templates/content/node--oe-sc-news--teaser.html.twig
--
GitLab
From 4b25abe440d1cef2c2c18d07d7e8705059259352 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Thu, 5 May 2022 11:14:38 +0200
Subject: [PATCH 32/46] OEL-1528: Update composer for starter content release
version.
---
composer.json | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/composer.json b/composer.json
index 69150254..65851ebb 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
"openeuropa/oe_media": "^1.14",
"openeuropa/oe_multilingual": "^1.9",
"openeuropa/oe_paragraphs": "^1.13",
- "openeuropa/oe_starter_content": "1.x-dev",
+ "openeuropa/oe_starter_content": "^1.0.0-beta1",
"openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
"phpspec/prophecy-phpunit": "^1 || ^2",
"symfony/dom-crawler": "^4.4.12"
@@ -54,10 +54,6 @@
"drupal":{
"type": "composer",
"url": "https://packages.drupal.org/8"
- },
- "openeuropa/oe_starter_content": {
- "type": "git",
- "url": "https://github.com/openeuropa/oe_starter_content"
}
},
"autoload": {
--
GitLab
From 581428ee79d77191221fd677ca7ef807b3debf33 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Thu, 5 May 2022 11:15:23 +0200
Subject: [PATCH 33/46] OEL-1528: Move drupal twig_field_value module to
whitelabel parent .info.
---
.../oe_whitelabel_starter_event.info.yml | 1 -
.../oe_whitelabel_starter_news.info.yml | 1 -
oe_whitelabel.info.yml | 3 +++
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml
index 2b18cf02..4ed9284a 100755
--- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml
@@ -4,7 +4,6 @@ description: Adds additional functionality to the Event module
package: OpenEuropa Whitelabel Theme
core_version_requirement: ^9.2
dependencies:
- - drupal:twig_field_value
- oe_whitelabel:oe_whitelabel_helper
- oe_starter_content:oe_starter_content_event
diff --git a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml
index 2a50f9cf..301d65c4 100644
--- a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml
@@ -6,7 +6,6 @@ core_version_requirement: ^9.2
dependencies:
- oe_whitelabel:oe_whitelabel_helper
- oe_starter_content:oe_starter_content_news
- - drupal:twig_field_value
config_devel:
install:
diff --git a/oe_whitelabel.info.yml b/oe_whitelabel.info.yml
index 1e46bc1a..935d7795 100644
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
@@ -5,6 +5,9 @@ type: theme
base theme: oe_bootstrap_theme
core_version_requirement: ^8.9 || ^9.1
+dependencies:
+ - drupal:twig_field_value
+
libraries:
- oe_whitelabel/style
--
GitLab
From a7de009f4bb0676ec91b58485711af149723d4c7 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Thu, 5 May 2022 11:54:22 +0200
Subject: [PATCH 34/46] OEL-1528: Move drupal twig_field_value module to
whitelabel helper.
---
modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml | 1 +
oe_whitelabel.info.yml | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
index 3eb3f1ff..210d21be 100644
--- a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
+++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
@@ -6,6 +6,7 @@ core_version_requirement: ^9.2
dependencies:
- drupal:node
+ - drupal:twig_field_value
- oe_bootstrap_theme:oe_bootstrap_theme_helper
- openeuropa:oe_corporate_blocks
diff --git a/oe_whitelabel.info.yml b/oe_whitelabel.info.yml
index 935d7795..1e46bc1a 100644
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
@@ -5,9 +5,6 @@ type: theme
base theme: oe_bootstrap_theme
core_version_requirement: ^8.9 || ^9.1
-dependencies:
- - drupal:twig_field_value
-
libraries:
- oe_whitelabel/style
--
GitLab
From 369ca76c4acd29c623b2b4feb7787b93295c8db9 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Thu, 5 May 2022 12:29:02 +0200
Subject: [PATCH 35/46] OEL-1528: Check if oe_corporate_blocks dependency is
needed or not.
---
modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
index 210d21be..34e64463 100644
--- a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
+++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
@@ -8,7 +8,6 @@ dependencies:
- drupal:node
- drupal:twig_field_value
- oe_bootstrap_theme:oe_bootstrap_theme_helper
- - openeuropa:oe_corporate_blocks
'interface translation project': oe_whitelabel_helper
--
GitLab
From f387a518313d617f234e5d4e358ca63399215758 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Thu, 5 May 2022 14:03:41 +0200
Subject: [PATCH 36/46] OEL-1528: Add corporate blocks on tests to solve the
dependency.
---
tests/src/Functional/ContentEventRenderTest.php | 1 +
tests/src/Functional/ContentNewsRenderTest.php | 1 +
tests/src/Functional/FacetsSummaryTest.php | 1 +
3 files changed, 3 insertions(+)
diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index 9163263d..31df5028 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -24,6 +24,7 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
*/
public static $modules = [
'block',
+ 'oe_corporate_blocks',
'oe_whitelabel_starter_event',
];
diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php
index ae0eef5d..bde8625a 100644
--- a/tests/src/Functional/ContentNewsRenderTest.php
+++ b/tests/src/Functional/ContentNewsRenderTest.php
@@ -24,6 +24,7 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
*/
protected static $modules = [
'block',
+ 'oe_corporate_blocks',
'oe_whitelabel_starter_news',
];
diff --git a/tests/src/Functional/FacetsSummaryTest.php b/tests/src/Functional/FacetsSummaryTest.php
index 80e14b6a..10024b3f 100644
--- a/tests/src/Functional/FacetsSummaryTest.php
+++ b/tests/src/Functional/FacetsSummaryTest.php
@@ -26,6 +26,7 @@ class FacetsSummaryTest extends WhitelabelBrowserTestBase {
'block',
'facets_search_api_dependency',
'facets_summary',
+ 'oe_corporate_blocks',
'oe_whitelabel_helper',
];
--
GitLab
From 9df6e5cf0458805573d4a07e06f091a261419260 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Sun, 8 May 2022 23:57:20 +0200
Subject: [PATCH 37/46] OEL-1528: Revert changes on testing.
---
tests/src/Functional/ContentEventRenderTest.php | 1 -
tests/src/Functional/ContentNewsRenderTest.php | 1 -
tests/src/Functional/FacetsSummaryTest.php | 1 -
3 files changed, 3 deletions(-)
diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index 31df5028..9163263d 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -24,7 +24,6 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
*/
public static $modules = [
'block',
- 'oe_corporate_blocks',
'oe_whitelabel_starter_event',
];
diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php
index bde8625a..ae0eef5d 100644
--- a/tests/src/Functional/ContentNewsRenderTest.php
+++ b/tests/src/Functional/ContentNewsRenderTest.php
@@ -24,7 +24,6 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
*/
protected static $modules = [
'block',
- 'oe_corporate_blocks',
'oe_whitelabel_starter_news',
];
diff --git a/tests/src/Functional/FacetsSummaryTest.php b/tests/src/Functional/FacetsSummaryTest.php
index 10024b3f..80e14b6a 100644
--- a/tests/src/Functional/FacetsSummaryTest.php
+++ b/tests/src/Functional/FacetsSummaryTest.php
@@ -26,7 +26,6 @@ class FacetsSummaryTest extends WhitelabelBrowserTestBase {
'block',
'facets_search_api_dependency',
'facets_summary',
- 'oe_corporate_blocks',
'oe_whitelabel_helper',
];
--
GitLab
From 862d2509024becf058f7926c26608093972d0d63 Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Sun, 8 May 2022 23:57:41 +0200
Subject: [PATCH 38/46] OEL-1528: Dependency added back again.
---
modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
index 34e64463..210d21be 100644
--- a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
+++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml
@@ -8,6 +8,7 @@ dependencies:
- drupal:node
- drupal:twig_field_value
- oe_bootstrap_theme:oe_bootstrap_theme_helper
+ - openeuropa:oe_corporate_blocks
'interface translation project': oe_whitelabel_helper
--
GitLab
From 8305600d7da129010668d9d59830334dd4deeeca Mon Sep 17 00:00:00 2001
From: Sergio Elvira Prez <Maxfire@3113167.no-reply.drupal.org>
Date: Sun, 8 May 2022 23:58:16 +0200
Subject: [PATCH 39/46] OEL-1528: Remove enabling the module on runner.
---
runner.yml.dist | 1 -
1 file changed, 1 deletion(-)
diff --git a/runner.yml.dist b/runner.yml.dist
index 78ae4aaa..8d2203ba 100644
--- a/runner.yml.dist
+++ b/runner.yml.dist
@@ -18,7 +18,6 @@ drupal:
- "./vendor/bin/drush en config_devel -y"
- "./vendor/bin/drush en field_ui -y"
- "./vendor/bin/drush en oe_authentication -y"
- - "./vendor/bin/drush en oe_corporate_blocks -y"
- "./vendor/bin/drush en oe_whitelabel_multilingual -y"
- "./vendor/bin/drush en oe_whitelabel_contact_forms -y"
- "./vendor/bin/drush en oe_whitelabel_helper -y"
--
GitLab
From 129eaea5a75e6265eeb62d86e4443526db1d7f56 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 17 May 2022 17:38:20 +0200
Subject: [PATCH 40/46] OEL-1585: Fix logo url link in neutral flavour and test
coverage.
---
oe_whitelabel.theme | 2 --
templates/overrides/page/page.html.twig | 5 +++--
tests/src/Kernel/SiteBrandingBlockTest.php | 4 ++++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 490f62a8..f44bc248 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -8,7 +8,6 @@
declare(strict_types = 1);
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
use Drupal\oe_bootstrap_theme_helper\EuropeanUnionLanguages;
use Drupal\oe_whitelabel\DocumentMediaWrapper;
@@ -80,7 +79,6 @@ function oe_whitelabel_preprocess_page(&$variables) {
$variables['logo_aria_label'] = t('Home');
$variables['site_logo_alt'] = t('Home logo');
$variables['site_logo_title'] = t('Home');
- $site_logo_href = Url::fromRoute('<front>')->toString();
}
if ($variables['bcl_component_library'] === 'neutral') {
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index abfe5da7..a6f0c6e8 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -47,12 +47,13 @@
* @ingroup themeable
*/
#}
+{% set neutral = bcl_component_library == 'neutral' %}
{% set corporate_logos %}
- {% set anchor_attributes = bcl_component_library == 'neutral'
+ {% set anchor_attributes = neutral
? create_attribute().addClass(['navbar-brand'])
: create_attribute().addClass(['navbar-brand']).setAttribute('target', '_blank')
%}
- <a {{ anchor_attributes }} href="{{ site_logo_href }}">
+ <a {{ anchor_attributes }} href="{{ neutral ? front_page : site_logo_href }}">
{% if bcl_component_library == 'eu' %}
<picture>
<source media="(max-width: 992px)"
diff --git a/tests/src/Kernel/SiteBrandingBlockTest.php b/tests/src/Kernel/SiteBrandingBlockTest.php
index aadf149d..7ff03464 100644
--- a/tests/src/Kernel/SiteBrandingBlockTest.php
+++ b/tests/src/Kernel/SiteBrandingBlockTest.php
@@ -4,6 +4,7 @@ declare(strict_types = 1);
namespace Drupal\Tests\oe_whitelabel\Kernel;
+use Drupal\Core\Url;
use Drupal\KernelTests\KernelTestBase;
use Symfony\Component\DomCrawler\Crawler;
@@ -71,6 +72,7 @@ class SiteBrandingBlockTest extends KernelTestBase {
$link = $actual->filter('.text-decoration-none.align-bottom');
$this->assertCount(1, $link);
$actual = $crawler->filter('.site-logo.d-none.d-lg-inline-block');
+ $this->assertSame(Url::fromRoute('<front>')->toString(), $actual->attr('href'));
$this->assertCount(1, $actual);
$logo = $actual->filter('img');
$this->assertCount(1, $logo);
@@ -93,6 +95,7 @@ class SiteBrandingBlockTest extends KernelTestBase {
$link = $actual->filter('.text-decoration-none.align-bottom');
$this->assertCount(1, $link);
$actual = $crawler->filter('.site-logo.d-none.d-lg-inline-block');
+ $this->assertSame(Url::fromRoute('<front>')->toString(), $actual->attr('href'));
$this->assertCount(1, $actual);
$logo = $actual->filter('img');
$this->assertCount(1, $logo);
@@ -112,6 +115,7 @@ class SiteBrandingBlockTest extends KernelTestBase {
$actual = $crawler->filter('.bcl-header__site-name.site-name.h5.d-inline-block.d-lg-none');
$this->assertCount(1, $actual);
$link = $actual->filter('.text-decoration-none.align-bottom');
+ $this->assertSame(Url::fromRoute('<front>')->toString(), $link->attr('href'));
$this->assertCount(1, $link);
}
--
GitLab
From 91ef036693de6fa2a2b4e29cc1b145573c455f04 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Fri, 20 May 2022 18:58:18 +0300
Subject: [PATCH 41/46] Prepare release 1.0.0-beta1
---
CHANGELOG.md | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0aaca79..d3c21338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,38 @@
# Change Log
+## [1.0.0-beta1](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-beta1) (2022-05-20)
+[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-alpha7...1.0.0-beta1)
+
+**Closed issues:**
+
+- The header pattern displays an empty navbar when both regions are empty [\#50](https://github.com/openeuropa/oe_whitelabel/issues/50)
+
+**Merged pull requests:**
+
+- OEL-1585: Fix logo url link in neutral flavour and test coverage. [\#142](https://github.com/openeuropa/oe_whitelabel/pull/142) ([escuriola](https://github.com/escuriola))
+- Update EPIC-1293-Project [\#140](https://github.com/openeuropa/oe_whitelabel/pull/140) ([donquixote](https://github.com/donquixote))
+- OEL-0000: Remove explicit version requirement for drupal/remote\_stream\_wrapper [\#134](https://github.com/openeuropa/oe_whitelabel/pull/134) ([donquixote](https://github.com/donquixote))
+- OEL-1528: Fix whitelabel issues on template, composer and dependencies. [\#133](https://github.com/openeuropa/oe_whitelabel/pull/133) ([Maxfire](https://github.com/Maxfire))
+- OEL-0000: Fix remote\_stream\_wrapper version to 1.5.0 temporarily. [\#132](https://github.com/openeuropa/oe_whitelabel/pull/132) ([donquixote](https://github.com/donquixote))
+- OEL-1536: Specify extension type when using ConfigImporter. [\#131](https://github.com/openeuropa/oe_whitelabel/pull/131) ([donquixote](https://github.com/donquixote))
+- OEL-1525: Uninitialized config keys in SearchBlock [\#130](https://github.com/openeuropa/oe_whitelabel/pull/130) ([donquixote](https://github.com/donquixote))
+- OEL-1452: Escaped markup in description list paragraph. [\#127](https://github.com/openeuropa/oe_whitelabel/pull/127) ([brummbar](https://github.com/brummbar))
+- OEL-1374: Search page look & feel update [\#126](https://github.com/openeuropa/oe_whitelabel/pull/126) ([escuriola](https://github.com/escuriola))
+- OEL-1453: Consolidate theme regions [\#125](https://github.com/openeuropa/oe_whitelabel/pull/125) ([escuriola](https://github.com/escuriola))
+- OEL-1416: Fix tests for BCL 0.22.0 [\#124](https://github.com/openeuropa/oe_whitelabel/pull/124) ([donquixote](https://github.com/donquixote))
+- OEL-1357: README improvements [\#123](https://github.com/openeuropa/oe_whitelabel/pull/123) ([donquixote](https://github.com/donquixote))
+- OEL-1425: Use imageValueObject on oe\_whitelabel. [\#118](https://github.com/openeuropa/oe_whitelabel/pull/118) ([escuriola](https://github.com/escuriola))
+- EPIC-1293-Project [\#109](https://github.com/openeuropa/oe_whitelabel/pull/109) ([Maxfire](https://github.com/Maxfire))
+- OEL-1227: Move content banner into a block. [\#101](https://github.com/openeuropa/oe_whitelabel/pull/101) ([donquixote](https://github.com/donquixote))
+- OEL-1317: Improve navbar search form. [\#100](https://github.com/openeuropa/oe_whitelabel/pull/100) ([escuriola](https://github.com/escuriola))
+- OEL-486: Improve test coverage [\#89](https://github.com/openeuropa/oe_whitelabel/pull/89) ([drishu](https://github.com/drishu))
+
## [1.0.0-alpha7](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-alpha7) (2022-04-08)
[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-alpha6...1.0.0-alpha7)
**Merged pull requests:**
+- Prepare release 1.0.0-alpha7 [\#120](https://github.com/openeuropa/oe_whitelabel/pull/120) ([abel-santos-corral](https://github.com/abel-santos-corral))
- OEL-1434: Filter out bundles if no legacy fields present [\#119](https://github.com/openeuropa/oe_whitelabel/pull/119) ([abel-santos-corral](https://github.com/abel-santos-corral))
## [1.0.0-alpha6](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-alpha6) (2022-04-07)
@@ -119,4 +147,4 @@
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
--
GitLab
From 30af41b151d702971f28f594107307fd06e1e4e2 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Fri, 20 May 2022 19:40:59 +0300
Subject: [PATCH 42/46] Prepare dependencies for release 1.0.0-beta1.
---
composer.json | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index 65851ebb..e2d93004 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "0.1.202204221756"
+ "openeuropa/oe_bootstrap_theme": "1.0.0-beta1"
},
"require-dev": {
"composer/installers": "^1.11",
@@ -78,11 +78,6 @@
}
}
},
- "patches": {
- "openeuropa/oe_bootstrap_theme": {
- "latest": "https://github.com/openeuropa/oe_bootstrap_theme/compare/0.1.202204221756..1.x.diff"
- }
- },
"drupal-scaffold": {
"locations": {
"web-root": "./build"
--
GitLab
From e714b4449f111153b770d39f85f174c8035fd1ed Mon Sep 17 00:00:00 2001
From: Andreas Hennings <andreas@dqxtech.net>
Date: Mon, 23 May 2022 14:49:33 +0200
Subject: [PATCH 43/46] OEL-1632: Add upgrade hooks for moving content banner
into block.
---
...ock.block.oe_whitelabel_content_banner.yml | 21 ++++++
...ity_view_mode.node.oe_w_content_banner.yml | 9 +++
.../oe_whitelabel_helper.post_update.php | 21 ++++++
...ity_view_display.node.oe_sc_event.full.yml | 69 +++++++++++++++++++
...y.node.oe_sc_event.oe_w_content_banner.yml | 47 +++++++++++++
...y_view_display.node.oe_sc_event.teaser.yml | 56 +++++++++++++++
...e_whitelabel_starter_event.post_update.php | 22 ++++++
...tity_view_display.node.oe_sc_news.full.yml | 40 +++++++++++
...ay.node.oe_sc_news.oe_w_content_banner.yml | 44 ++++++++++++
...oe_whitelabel_starter_news.post_update.php | 21 ++++++
10 files changed, 350 insertions(+)
create mode 100644 modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml
create mode 100644 modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml
create mode 100644 modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php
create mode 100755 modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml
create mode 100644 modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml
create mode 100755 modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml
create mode 100644 modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php
create mode 100644 modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml
create mode 100644 modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml
create mode 100644 modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php
diff --git a/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml
new file mode 100644
index 00000000..a7739a82
--- /dev/null
+++ b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+ theme:
+ - oe_whitelabel
+id: oe_whitelabel_content_banner
+theme: oe_whitelabel
+region: hero
+weight: -6
+provider: null
+plugin: oe_w_content_banner
+settings:
+ id: oe_w_content_banner
+ label: 'Content banner'
+ label_display: '0'
+ provider: node
+ context_mapping:
+ node: '@node.node_route_context:node'
+visibility: { }
diff --git a/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml
new file mode 100644
index 00000000..f9fd090f
--- /dev/null
+++ b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+id: node.oe_w_content_banner
+label: 'Content banner'
+targetEntityType: node
+cache: true
diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php b/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php
new file mode 100644
index 00000000..d82ac165
--- /dev/null
+++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Post update hooks.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\oe_bootstrap_theme\ConfigImporter;
+
+/**
+ * Move content banner into a block.
+ */
+function oe_whitelabel_helper_post_update_00001(): void {
+ $configs = [
+ 'block.block.oe_whitelabel_content_banner',
+ 'core.entity_view_mode.node.oe_w_content_banner',
+ ];
+ ConfigImporter::importMultiple('module', 'oe_whitelabel_helper', '/config/post_updates/00001_content_banner', $configs, TRUE);
+}
diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml
new file mode 100755
index 00000000..6ad2e19b
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml
@@ -0,0 +1,69 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.full
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_sc_event_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
+ module:
+ - datetime_range
+ - oe_whitelabel_helper
+ - text
+ - user
+id: node.oe_sc_event.full
+targetEntityType: node
+bundle: oe_sc_event
+mode: full
+content:
+ body:
+ type: text_default
+ label: above
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+ links:
+ settings: { }
+ third_party_settings: { }
+ weight: 4
+ region: content
+ oe_documents:
+ type: entity_reference_entity_view
+ label: above
+ settings:
+ view_mode: default
+ link: true
+ third_party_settings: { }
+ weight: 3
+ region: content
+ oe_sc_event_dates:
+ type: daterange_default
+ label: inline
+ settings:
+ timezone_override: ''
+ format_type: oe_whitelabel_starter_event_date
+ separator: to
+ third_party_settings: { }
+ weight: 1
+ region: content
+ oe_sc_event_location:
+ type: oe_whitelabel_helper_address_inline
+ label: inline
+ settings:
+ delimiter: ', '
+ third_party_settings: { }
+ weight: 2
+ region: content
+hidden:
+ langcode: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_featured_media: true
+ oe_summary: true
diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml
new file mode 100644
index 00000000..f6d0cd2a
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml
@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.oe_w_content_banner
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_sc_event_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
+ module:
+ - oe_content_featured_media_field
+ - text
+ - user
+id: node.oe_sc_event.oe_w_content_banner
+targetEntityType: node
+bundle: oe_sc_event
+mode: oe_w_content_banner
+content:
+ oe_featured_media:
+ type: oe_featured_media_label
+ label: hidden
+ settings:
+ link: true
+ third_party_settings: { }
+ weight: 1
+ region: content
+ oe_summary:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ body: true
+ langcode: true
+ links: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_documents: true
+ oe_sc_event_dates: true
+ oe_sc_event_location: true
diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml
new file mode 100755
index 00000000..62339844
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml
@@ -0,0 +1,56 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.teaser
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_sc_event_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
+ module:
+ - address
+ - datetime_range
+ - text
+ - user
+id: node.oe_sc_event.teaser
+targetEntityType: node
+bundle: oe_sc_event
+mode: teaser
+content:
+ oe_sc_event_dates:
+ type: daterange_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: oe_whitelabel_starter_event_date
+ separator: to
+ third_party_settings: { }
+ weight: 4
+ region: content
+ oe_sc_event_location:
+ type: address_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 5
+ region: content
+ oe_summary:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 2
+ region: content
+hidden:
+ body: true
+ langcode: true
+ links: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_documents: true
+ oe_featured_media: true
diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php
new file mode 100644
index 00000000..fe1ab7d3
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Post update hooks.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\oe_bootstrap_theme\ConfigImporter;
+
+/**
+ * Move content banner into a block.
+ */
+function oe_whitelabel_starter_event_post_update_00001(): void {
+ $configs = [
+ 'core.entity_view_display.node.oe_sc_event.full',
+ 'core.entity_view_display.node.oe_sc_event.oe_w_content_banner',
+ 'core.entity_view_display.node.oe_sc_event.teaser',
+ ];
+ ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_event', '/config/post_updates/00001_content_banner', $configs, TRUE);
+}
diff --git a/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml
new file mode 100644
index 00000000..c79b5a1c
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml
@@ -0,0 +1,40 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.full
+ - field.field.node.oe_sc_news.body
+ - field.field.node.oe_sc_news.oe_featured_media
+ - field.field.node.oe_sc_news.oe_publication_date
+ - field.field.node.oe_sc_news.oe_summary
+ - node.type.oe_sc_news
+ module:
+ - text
+ - user
+id: node.oe_sc_news.full
+targetEntityType: node
+bundle: oe_sc_news
+mode: full
+content:
+ body:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+ links:
+ settings: { }
+ third_party_settings: { }
+ weight: 1
+ region: content
+hidden:
+ langcode: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_featured_media: true
+ oe_publication_date: true
+ oe_summary: true
+ search_api_excerpt: true
diff --git a/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml
new file mode 100644
index 00000000..2eb3b134
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml
@@ -0,0 +1,44 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.oe_w_content_banner
+ - field.field.node.oe_sc_news.body
+ - field.field.node.oe_sc_news.oe_featured_media
+ - field.field.node.oe_sc_news.oe_publication_date
+ - field.field.node.oe_sc_news.oe_summary
+ - node.type.oe_sc_news
+ module:
+ - datetime
+ - text
+ - user
+id: node.oe_sc_news.oe_w_content_banner
+targetEntityType: node
+bundle: oe_sc_news
+mode: oe_w_content_banner
+content:
+ oe_publication_date:
+ type: datetime_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: oe_whitelabel_starter_news_date
+ third_party_settings: { }
+ weight: 1
+ region: content
+ oe_summary:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ body: true
+ langcode: true
+ links: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_featured_media: true
diff --git a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php
new file mode 100644
index 00000000..4f5a1352
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Post update hooks.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\oe_bootstrap_theme\ConfigImporter;
+
+/**
+ * Move content banner into a block.
+ */
+function oe_whitelabel_starter_news_post_update_00001(): void {
+ $configs = [
+ 'core.entity_view_display.node.oe_sc_news.full',
+ 'core.entity_view_display.node.oe_sc_news.oe_w_content_banner',
+ ];
+ ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_news', '/config/post_updates/00001_content_banner', $configs, TRUE);
+}
--
GitLab
From c32f17d7b6fa333cd21d0696c63971476fc93099 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Mon, 23 May 2022 17:24:51 +0300
Subject: [PATCH 44/46] Prepare release 1.0.0-beta2
---
CHANGELOG.md | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3c21338..937b7a57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Change Log
+## [1.0.0-beta2](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-beta2) (2022-05-23)
+[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-beta1...1.0.0-beta2)
+
+**Merged pull requests:**
+
+- OEL-1632: Add upgrade hooks for moving content banner into block. [\#147](https://github.com/openeuropa/oe_whitelabel/pull/147) ([donquixote](https://github.com/donquixote))
+
## [1.0.0-beta1](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-beta1) (2022-05-20)
[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-alpha7...1.0.0-beta1)
@@ -9,6 +16,8 @@
**Merged pull requests:**
+- Prepare dependencies for release 1.0.0-beta1 [\#146](https://github.com/openeuropa/oe_whitelabel/pull/146) ([drishu](https://github.com/drishu))
+- Prepare release 1.0.0-beta1 [\#145](https://github.com/openeuropa/oe_whitelabel/pull/145) ([drishu](https://github.com/drishu))
- OEL-1585: Fix logo url link in neutral flavour and test coverage. [\#142](https://github.com/openeuropa/oe_whitelabel/pull/142) ([escuriola](https://github.com/escuriola))
- Update EPIC-1293-Project [\#140](https://github.com/openeuropa/oe_whitelabel/pull/140) ([donquixote](https://github.com/donquixote))
- OEL-0000: Remove explicit version requirement for drupal/remote\_stream\_wrapper [\#134](https://github.com/openeuropa/oe_whitelabel/pull/134) ([donquixote](https://github.com/donquixote))
@@ -147,4 +156,4 @@
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
--
GitLab
From 74b997f503ce26ee886c713dcf88f27cd8e39ab2 Mon Sep 17 00:00:00 2001
From: Andreas Hennings <andreas@dqxtech.net>
Date: Tue, 24 May 2022 19:24:24 +0200
Subject: [PATCH 45/46] OEL-1450: Remove duplicate <hr>, no longer needed after
merging 1.x.
In 1.x, a <hr> was added via pager.html.twig.
In list pages epic, a <hr> was added via item-list--oe-list-pages-results.html.twig.
After merging, there are now two <hr> that separate the list from the pager.
One of them needed to be removed.
---
templates/list_pages/item-list--oe-list-pages-results.html.twig | 1 -
1 file changed, 1 deletion(-)
diff --git a/templates/list_pages/item-list--oe-list-pages-results.html.twig b/templates/list_pages/item-list--oe-list-pages-results.html.twig
index 8acea4bf..a18164bf 100644
--- a/templates/list_pages/item-list--oe-list-pages-results.html.twig
+++ b/templates/list_pages/item-list--oe-list-pages-results.html.twig
@@ -31,4 +31,3 @@
{%- endif -%}
</div>
</div>
-<hr class="d-none d-md-block mt-4-5">
--
GitLab
From 1d4694844e4d978750e5a5fdc66d30d6481fdb31 Mon Sep 17 00:00:00 2001
From: Andreas Hennings <andreas@dqxtech.net>
Date: Tue, 24 May 2022 19:47:48 +0200
Subject: [PATCH 46/46] OEL-1450: Update pager link count to include link to
last page.
---
.../tests/src/Functional/ListPagesTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php b/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
index 44b8bdfa..38a9f5db 100644
--- a/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
+++ b/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
@@ -95,7 +95,7 @@ class ListPagesTest extends WhitelabelBrowserTestBase {
$assert_session->elementsCount('css', 'div.listing-item', '10');
// Assert pagination.
$assert_session->elementExists('css', 'nav > ul.pagination');
- $assert_session->elementsCount('css', 'ul.pagination > li.page-item', 3);
+ $assert_session->elementsCount('css', 'ul.pagination > li.page-item', 4);
// Assert search.
$page->fillField('Title', 'News number 8');
--
GitLab