From b8767b74b63c6387c0eef2bb823dc71aa8c47ee3 Mon Sep 17 00:00:00 2001
From: Kristen Pol <kristen.pol@gmail.com>
Date: Fri, 21 Mar 2025 14:56:46 -0700
Subject: [PATCH 1/2] Working around XB bug with include paths.
---
templates/views/views-exposed-form.html.twig | 34 --------------------
templates/views/views-view-grid.html.twig | 14 --------
templates/views/views-view-table.html.twig | 12 -------
3 files changed, 60 deletions(-)
delete mode 100644 templates/views/views-exposed-form.html.twig
delete mode 100644 templates/views/views-view-grid.html.twig
delete mode 100644 templates/views/views-view-table.html.twig
diff --git a/templates/views/views-exposed-form.html.twig b/templates/views/views-exposed-form.html.twig
deleted file mode 100644
index cebfdc74..00000000
--- a/templates/views/views-exposed-form.html.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{#
-/**
- * @file
- * CivicTheme implementation of views exposed form.
- */
-#}
-{% if q is not empty %}
- {#
- This ensures that, if clean URLs are off, the 'q' is added first,
- as a hidden form element, so that it shows up first in the POST URL.
- #}
- {{ q }}
-{% endif %}
-
-{% if single_filter %}
- {% include '@molecules/single-filter/single-filter.twig' with {
- theme: theme,
- title: filter_title,
- items: filter_items,
- is_multiple: is_multiple,
- form_attributes: form_attributes,
- form_suffix: form_suffix,
- } only %}
-{% elseif group_filter %}
- {% include '@molecules/group-filter/group-filter.twig' with {
- theme: theme,
- title: filter_title,
- items: filter_items,
- form_attributes: form_attributes,
- form_suffix: form_suffix,
- } %}
-{% else %}
- {{ form }}
-{% endif %}
diff --git a/templates/views/views-view-grid.html.twig b/templates/views/views-view-grid.html.twig
deleted file mode 100644
index f1960f1d..00000000
--- a/templates/views/views-view-grid.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{#
-/**
- * @file
- * CivicTheme implementation for views to display rows in a grid.
- */
-#}
-{% include '@base/grid/grid.twig' with {
- theme: theme,
- items: rows,
- template_column_count: options.columns,
- fill_width: fill_width,
- modifier_class: modifier_class,
- row_class: 'row--equal-heights-content row--vertically-spaced',
-} only %}
diff --git a/templates/views/views-view-table.html.twig b/templates/views/views-view-table.html.twig
deleted file mode 100644
index cc118410..00000000
--- a/templates/views/views-view-table.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{#
-/**
- * @file
- * Theme override to display a views table.
- */
-#}
-
-{% if civictheme_component_optout is not empty %}
- {% include "@views/views-view-table.html.twig" %}
-{% else %}
- {% include "@atoms/table/table.twig" %}
-{% endif %}
--
GitLab
From 4935dc15b5028654c91bf9990225c540c0c9d5fe Mon Sep 17 00:00:00 2001
From: Kristen Pol <kristen.pol@gmail.com>
Date: Fri, 21 Mar 2025 14:57:38 -0700
Subject: [PATCH 2/2] Working around xb include path bug.
---
.../views/views-exposed-form.html.twig.orig | 34 +++++++++++++++++++
.../views/views-view-grid.html.twig.orig | 14 ++++++++
.../views/views-view-table.html.twig.orig | 12 +++++++
...ew.html.twig => views-view.html.twig.orig} | 0
4 files changed, 60 insertions(+)
create mode 100644 templates/views/views-exposed-form.html.twig.orig
create mode 100644 templates/views/views-view-grid.html.twig.orig
create mode 100644 templates/views/views-view-table.html.twig.orig
rename templates/views/{views-view.html.twig => views-view.html.twig.orig} (100%)
diff --git a/templates/views/views-exposed-form.html.twig.orig b/templates/views/views-exposed-form.html.twig.orig
new file mode 100644
index 00000000..cebfdc74
--- /dev/null
+++ b/templates/views/views-exposed-form.html.twig.orig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * CivicTheme implementation of views exposed form.
+ */
+#}
+{% if q is not empty %}
+ {#
+ This ensures that, if clean URLs are off, the 'q' is added first,
+ as a hidden form element, so that it shows up first in the POST URL.
+ #}
+ {{ q }}
+{% endif %}
+
+{% if single_filter %}
+ {% include '@molecules/single-filter/single-filter.twig' with {
+ theme: theme,
+ title: filter_title,
+ items: filter_items,
+ is_multiple: is_multiple,
+ form_attributes: form_attributes,
+ form_suffix: form_suffix,
+ } only %}
+{% elseif group_filter %}
+ {% include '@molecules/group-filter/group-filter.twig' with {
+ theme: theme,
+ title: filter_title,
+ items: filter_items,
+ form_attributes: form_attributes,
+ form_suffix: form_suffix,
+ } %}
+{% else %}
+ {{ form }}
+{% endif %}
diff --git a/templates/views/views-view-grid.html.twig.orig b/templates/views/views-view-grid.html.twig.orig
new file mode 100644
index 00000000..f1960f1d
--- /dev/null
+++ b/templates/views/views-view-grid.html.twig.orig
@@ -0,0 +1,14 @@
+{#
+/**
+ * @file
+ * CivicTheme implementation for views to display rows in a grid.
+ */
+#}
+{% include '@base/grid/grid.twig' with {
+ theme: theme,
+ items: rows,
+ template_column_count: options.columns,
+ fill_width: fill_width,
+ modifier_class: modifier_class,
+ row_class: 'row--equal-heights-content row--vertically-spaced',
+} only %}
diff --git a/templates/views/views-view-table.html.twig.orig b/templates/views/views-view-table.html.twig.orig
new file mode 100644
index 00000000..cc118410
--- /dev/null
+++ b/templates/views/views-view-table.html.twig.orig
@@ -0,0 +1,12 @@
+{#
+/**
+ * @file
+ * Theme override to display a views table.
+ */
+#}
+
+{% if civictheme_component_optout is not empty %}
+ {% include "@views/views-view-table.html.twig" %}
+{% else %}
+ {% include "@atoms/table/table.twig" %}
+{% endif %}
diff --git a/templates/views/views-view.html.twig b/templates/views/views-view.html.twig.orig
similarity index 100%
rename from templates/views/views-view.html.twig
rename to templates/views/views-view.html.twig.orig
--
GitLab