From 8519a9efd6ec999cfb7fed7d3b78b87c4c812cbe Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Wed, 8 Sep 2021 18:50:45 +0000 Subject: [PATCH 1/6] ISTWCMS-5032: adding catalog search to viewes-view --- templates/views/views-view.html.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/views/views-view.html.twig b/templates/views/views-view.html.twig index 3e0d7d1..79b4402 100644 --- a/templates/views/views-view.html.twig +++ b/templates/views/views-view.html.twig @@ -40,6 +40,10 @@ ] %} +{% if catalog_search %} + {{ catalog_search }} +{% endif %} + {% include '@components/view/views-view/views-view.twig' with { 'attributes': attributes, 'css_name': css_name, -- GitLab From dc4f08cc4e2e3c9549b548b4f7d4c7f84996fcfe Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Thu, 9 Sep 2021 02:07:18 +0000 Subject: [PATCH 2/6] ISTWCMS-5032: updating views-view to use pattern-lab version of catalog search --- templates/views/views-view.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/views/views-view.html.twig b/templates/views/views-view.html.twig index 79b4402..3fe269c 100644 --- a/templates/views/views-view.html.twig +++ b/templates/views/views-view.html.twig @@ -41,7 +41,9 @@ %} {% if catalog_search %} - {{ catalog_search }} + {% include '@components/catalog-search/catalog-search.twig' with { + 'catalog_search': catalog_search + } %} {% endif %} {% include '@components/view/views-view/views-view.twig' with { -- GitLab From f99d6a7dae5b52f203bae2466b82222c91ed4220 Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Tue, 21 Sep 2021 03:07:18 +0000 Subject: [PATCH 3/6] ISTWCMS-5032: updating info file to exclude certain core css that interferes with gesso --- uw_fdsu_theme_resp.info.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uw_fdsu_theme_resp.info.yml b/uw_fdsu_theme_resp.info.yml index 5c63935..149e640 100644 --- a/uw_fdsu_theme_resp.info.yml +++ b/uw_fdsu_theme_resp.info.yml @@ -39,6 +39,8 @@ stylesheets-remove: - 'core/themes/seven/css/base/elements.css' - 'core/themes/seven/css/components/pager.css' - 'core/themes/seven/css/classy/components/pager.css' + - 'core/themes/seven/css/classy/components/form.css' + - 'core/themes/seven/css/components/form.css' # - '@stable/css/system/components/align.module.css' # - '@stable/css/system/components/fieldgroup.module.css' # - '@stable/css/system/components/container-inline.module.css' -- GitLab From 38e7b6299e71db12dd794ffd9b006f47dc8b2437 Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Tue, 21 Sep 2021 03:07:45 +0000 Subject: [PATCH 4/6] ISTWCMS-5032: adding catalog search to specific catalogs view --- .../views/views-view--uw_view_catalog_show_nodes.html.twig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/views/views-view--uw_view_catalog_show_nodes.html.twig b/templates/views/views-view--uw_view_catalog_show_nodes.html.twig index 5a2c9b1..73e573a 100644 --- a/templates/views/views-view--uw_view_catalog_show_nodes.html.twig +++ b/templates/views/views-view--uw_view_catalog_show_nodes.html.twig @@ -2,6 +2,12 @@ 'content_list': content_list, } %} +{% if catalog_search %} + {% include '@components/catalog-search/catalog-search.twig' with { + 'catalog_search': catalog_search + } %} +{% endif %} + {% include '@components/view/views-view/views-view.twig' with { 'title_prefix': title_prefix, 'title': title, -- GitLab From 1ad11b6a980f6b47e908c1e6dc73531c15cd0c97 Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Mon, 27 Sep 2021 20:15:24 +0000 Subject: [PATCH 5/6] ISTWCMS-5032: adding catalog search to the show terms template --- .../views/views-view--uw_view_catalog_show_terms.html.twig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/views/views-view--uw_view_catalog_show_terms.html.twig b/templates/views/views-view--uw_view_catalog_show_terms.html.twig index 5a2c9b1..73e573a 100644 --- a/templates/views/views-view--uw_view_catalog_show_terms.html.twig +++ b/templates/views/views-view--uw_view_catalog_show_terms.html.twig @@ -2,6 +2,12 @@ 'content_list': content_list, } %} +{% if catalog_search %} + {% include '@components/catalog-search/catalog-search.twig' with { + 'catalog_search': catalog_search + } %} +{% endif %} + {% include '@components/view/views-view/views-view.twig' with { 'title_prefix': title_prefix, 'title': title, -- GitLab From 751cae6d56cee81bafb57ab08f61a663eb117fe8 Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Wed, 29 Sep 2021 14:10:08 +0000 Subject: [PATCH 6/6] ISTWCMS-5032: putting back default forms css so that requried fields show, this will not make magnifying glass look correct until Martin's form ticket gets merged --- uw_fdsu_theme_resp.info.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uw_fdsu_theme_resp.info.yml b/uw_fdsu_theme_resp.info.yml index 149e640..9e4ecbe 100644 --- a/uw_fdsu_theme_resp.info.yml +++ b/uw_fdsu_theme_resp.info.yml @@ -39,8 +39,8 @@ stylesheets-remove: - 'core/themes/seven/css/base/elements.css' - 'core/themes/seven/css/components/pager.css' - 'core/themes/seven/css/classy/components/pager.css' - - 'core/themes/seven/css/classy/components/form.css' - - 'core/themes/seven/css/components/form.css' +# - 'core/themes/seven/css/classy/components/form.css' +# - 'core/themes/seven/css/components/form.css' # - '@stable/css/system/components/align.module.css' # - '@stable/css/system/components/fieldgroup.module.css' # - '@stable/css/system/components/container-inline.module.css' -- GitLab