From e923af1174fde1b6c07bcbab7335fe17cfc843b4 Mon Sep 17 00:00:00 2001 From: ebremner <ebremner@uwaterloo.ca> Date: Mon, 7 Jun 2021 16:49:51 -0400 Subject: [PATCH] ISTWCMS-4619: removing views templates that are no longer required and adding generic views-view and node-teaser --- templates/node/node--teaser.html.twig | 9 +++ .../node/node--uw-ct-blog--teaser.html.twig | 8 --- .../views/views-view--uw_view_blogs.html.twig | 6 -- .../views-view--uw_view_events.html.twig | 6 -- .../views-view--uw_view_news_items.html.twig | 6 -- templates/views/views-view.html.twig | 62 +++++++++++++++++++ 6 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 templates/node/node--teaser.html.twig delete mode 100644 templates/node/node--uw-ct-blog--teaser.html.twig delete mode 100644 templates/views/views-view--uw_view_blogs.html.twig delete mode 100644 templates/views/views-view--uw_view_events.html.twig delete mode 100644 templates/views/views-view--uw_view_news_items.html.twig create mode 100644 templates/views/views-view.html.twig diff --git a/templates/node/node--teaser.html.twig b/templates/node/node--teaser.html.twig new file mode 100644 index 00000000..d1701a8b --- /dev/null +++ b/templates/node/node--teaser.html.twig @@ -0,0 +1,9 @@ +{% include '@components/card/card.twig' with { + 'title': teaser.title, + 'date': teaser.date, + 'sources': teaser.sources, + 'tags': teaser.tags, + 'content': teaser.content, + 'header_level': 2, + 'show_hover': true, +} %} diff --git a/templates/node/node--uw-ct-blog--teaser.html.twig b/templates/node/node--uw-ct-blog--teaser.html.twig deleted file mode 100644 index 9628e62f..00000000 --- a/templates/node/node--uw-ct-blog--teaser.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% include '@components/card/card.twig' with { - 'title': blog.title, - 'date': blog.date, - 'sources': blog.sources, - 'tags': blog.tags, - 'content': blog.content, - 'header_level': 2, -} %} diff --git a/templates/views/views-view--uw_view_blogs.html.twig b/templates/views/views-view--uw_view_blogs.html.twig deleted file mode 100644 index a92c14d1..00000000 --- a/templates/views/views-view--uw_view_blogs.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% include '@components/view/views-view/views-view-uw-view-blogs.twig' with { - 'title': title, - 'exposed': exposed, - 'rows': rows, - 'pager': pager -} %} diff --git a/templates/views/views-view--uw_view_events.html.twig b/templates/views/views-view--uw_view_events.html.twig deleted file mode 100644 index 0394983a..00000000 --- a/templates/views/views-view--uw_view_events.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% include '@components/view/views-view/views-view-uw-view-events.twig' with { - 'title': title, - 'exposed': exposed, - 'rows': rows, - 'pager': pager -} %} diff --git a/templates/views/views-view--uw_view_news_items.html.twig b/templates/views/views-view--uw_view_news_items.html.twig deleted file mode 100644 index c6c8b579..00000000 --- a/templates/views/views-view--uw_view_news_items.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% include '@components/view/views-view/views-view-uw-view-news-items.twig' with { - 'title': title, - 'exposed': exposed, - 'rows': rows, - 'pager': pager -} %} diff --git a/templates/views/views-view.html.twig b/templates/views/views-view.html.twig new file mode 100644 index 00000000..56f0bfa6 --- /dev/null +++ b/templates/views/views-view.html.twig @@ -0,0 +1,62 @@ +{# +/** + * @file + * Theme override for a main view template. + * + * Available variables: + * - attributes: Remaining HTML attributes for the element. + * - css_name: A CSS-safe version of the view name. + * - css_class: The user-specified classes names, if any. + * - header: The optional header. + * - footer: The optional footer. + * - rows: The results of the view query, if any. + * - empty: The content to display if there are no rows. + * - pager: The optional pager next/prev links to display. + * - exposed: Exposed widget form/info to display. + * - feed_icons: Optional feed icons to display. + * - more: An optional link to the next page of results. + * - title: Title of the view, only used when displaying in the admin preview. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the view title. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the view title. + * - attachment_before: An optional attachment view to be displayed before the + * view content. + * - attachment_after: An optional attachment view to be displayed after the + * view content. + * - dom_id: Unique id for every view being printed to give unique class for + * Javascript. + * + * @see template_preprocess_views_view() + */ +#} + +{% + set classes = [ + 'view', + 'view-' ~ id|clean_class, + 'view-id-' ~ id, + 'view-display-id-' ~ display_id, + dom_id ? 'js-view-dom-id-' ~ dom_id, +] +%} + +{% include '@components/view/views-view/views-view.twig' with { + 'attributes': attributes, + 'css_name': css_name, + 'css_class': css_class, + 'header': header, + 'footer': footer, + 'rows': rows, + 'empty': empty, + 'pager': pager, + 'exposed': exposed, + 'feed_icons': feed_icons, + 'more': more, + 'title': title, + 'title_prefix': title_prefix, + 'title_suffix': title_suffix, + 'attachment_before': attachment_before, + 'attachment_after': attachment_after, + 'dom_id': dom_id, +} %} -- GitLab