From af954fa74036d511c05c05d958f04ca663cb8382 Mon Sep 17 00:00:00 2001 From: James O'Toole Date: Fri, 28 Jan 2022 14:30:00 -0800 Subject: [PATCH 1/4] Ensure summary is shown on landing page --- .../field.field.node.ubc_landing_page.body.yml | 12 +++++++++--- ubc_landing_page/ubc_landing_page.info.yml | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ubc_landing_page/config/install/field.field.node.ubc_landing_page.body.yml b/ubc_landing_page/config/install/field.field.node.ubc_landing_page.body.yml index d3fb4f5..792a895 100644 --- a/ubc_landing_page/config/install/field.field.node.ubc_landing_page.body.yml +++ b/ubc_landing_page/config/install/field.field.node.ubc_landing_page.body.yml @@ -7,13 +7,18 @@ dependencies: module: - allowed_formats - text + - text_summary_options third_party_settings: allowed_formats: filtered_text: filtered_text - basic_html: '0' + simple: '0' restricted_html: '0' - full_html: '0' plain_text: '0' + text_summary_options: + show_summary: 1 + summary_help: '' +_core: + default_config_hash: pzetpqflYmMtTJo3OalqEFUkztw8NG75lIZZZwS4oyw id: node.ubc_landing_page.body field_name: body entity_type: node @@ -25,5 +30,6 @@ translatable: true default_value: { } default_value_callback: '' settings: - display_summary: false + display_summary: true + required_summary: false field_type: text_with_summary diff --git a/ubc_landing_page/ubc_landing_page.info.yml b/ubc_landing_page/ubc_landing_page.info.yml index bfae734..6528fe2 100755 --- a/ubc_landing_page/ubc_landing_page.info.yml +++ b/ubc_landing_page/ubc_landing_page.info.yml @@ -10,6 +10,7 @@ dependencies: - drupal:paragraphs - drupal:responsive_image - drupal:taxonomy + - drupal:text_summary_options - drupal:tour - drupal:toolbar - ubc_paragraph_entities:ubc_paragraph_entities From 9024f02f92a007a6168a93ae512d03c6726dff31 Mon Sep 17 00:00:00 2001 From: James O'Toole Date: Fri, 28 Jan 2022 15:23:23 -0800 Subject: [PATCH 2/4] Update views.view.content_announcement.yml --- .../views.view.content_announcement.yml | 297 +++++++++--------- 1 file changed, 152 insertions(+), 145 deletions(-) diff --git a/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_announcement.yml b/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_announcement.yml index 00a1a53..42d06d7 100644 --- a/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_announcement.yml +++ b/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_announcement.yml @@ -13,6 +13,8 @@ dependencies: - taxonomy - text - user +_core: + default_config_hash: RJObF_gR_0tMWM1nIz27xeL5_qEINNEXJsZ4eyqRlnk id: content_announcement label: 'Content: Announcement List' module: views @@ -22,94 +24,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Search - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: false - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 2 - offset: 0 - id: 0 - total_pages: null - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - quantity: 9 - style: - type: default - options: - row_class: '' - default_row_class: true - uses_fields: true - row: - type: 'entity:node' - options: - relationship: none - view_mode: card_horizontal + title: 'Content: Announcement List' fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -119,9 +61,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -139,6 +85,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: field label: '' exclude: false alter: @@ -193,7 +140,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field field_announcement_tags: id: field_announcement_tags table: node__field_announcement_tags @@ -201,6 +147,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: field label: '' exclude: false alter: @@ -256,30 +203,97 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field + pager: + type: full + options: + offset: 0 + items_per_page: 2 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Search + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: false + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: "

No results

\r\n

There are no results to your search. Please revise your search and try again.

" + tokenize: false + sorts: + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + arguments: { } filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 type: id: type table: node_field_data field: type - value: - ubc_announcement: ubc_announcement entity_type: node entity_field: type plugin_id: bundle + value: + ubc_announcement: ubc_announcement group: 1 expose: operator_limit_selection: false @@ -291,6 +305,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: combine operator: word value: '' group: 1 @@ -301,6 +316,8 @@ display: description: '' use_operator: false operator: combine_op + operator_limit_selection: false + operator_list: { } identifier: keywords required: false remember: false @@ -310,8 +327,6 @@ display: anonymous: '0' administrator: '0' placeholder: 'Enter search terms' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -327,7 +342,6 @@ display: fields: title: title body: body - plugin_id: combine field_announcement_type_target_id: id: field_announcement_type_target_id table: node__field_announcement_type @@ -335,6 +349,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: taxonomy_index_tid operator: or value: { } group: 1 @@ -345,6 +360,8 @@ display: description: '' use_operator: false operator: field_announcement_type_target_id_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -356,8 +373,6 @@ display: editor: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -371,12 +386,11 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - type: select - limit: true vid: announcement_type + type: select hierarchy: true + limit: true error_message: true - plugin_id: taxonomy_index_tid field_announcement_tags_target_id: id: field_announcement_tags_target_id table: node__field_announcement_tags @@ -384,6 +398,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: taxonomy_index_tid operator: or value: { } group: 1 @@ -394,6 +409,8 @@ display: description: '' use_operator: false operator: field_announcement_tags_target_id_op + operator_limit_selection: false + operator_list: { } identifier: tags required: false remember: false @@ -405,8 +422,6 @@ display: editor: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -420,51 +435,43 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - type: select - limit: true vid: tags + type: select hierarchy: true + limit: true error_message: true - plugin_id: taxonomy_index_tid - sorts: - created: - id: created - table: node_field_data - field: created - order: DESC - entity_type: node - entity_field: created - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - granularity: second - title: 'Content: Announcement List' - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: "

No results

\r\n

There are no results to your search. Please revise your search and try again.

If you're still unable to find what you're looking for, please contact us at 604-822-8111, or via email at hr.info@ubc.ca.

" - plugin_id: text_custom - relationships: { } - arguments: { } - display_extenders: { } filter_groups: operator: AND groups: 1: AND + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: false + uses_fields: true + type: ol + wrapper_class: item-list + class: 'list-none my-0 pl-0 flex flex-col gap-8' + row: + type: 'entity:node' + options: + relationship: none + view_mode: card_horizontal + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } use_ajax: true + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -479,14 +486,11 @@ display: - 'config:field.storage.node.body' - 'config:field.storage.node.field_announcement_tags' block_1: - display_plugin: block id: block_1 display_title: 'Card List' + display_plugin: block position: 1 display_options: - display_extenders: { } - block_description: 'Content: Announcement list view' - display_description: '' exposed_form: type: basic options: @@ -499,6 +503,9 @@ display: sort_desc_label: Desc defaults: exposed_form: false + display_description: '' + display_extenders: { } + block_description: 'Content: Announcement list view' cache_metadata: max-age: -1 contexts: @@ -513,57 +520,57 @@ display: - 'config:field.storage.node.body' - 'config:field.storage.node.field_announcement_tags' feed_1: - display_plugin: feed id: feed_1 display_title: Feed + display_plugin: feed position: 2 display_options: - display_extenders: { } - row: - type: node_rss - options: { } + title: Announcements filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 type: id: type table: node_field_data field: type - value: - ubc_announcement: ubc_announcement entity_type: node entity_field: type plugin_id: bundle + value: + ubc_announcement: ubc_announcement group: 1 expose: operator_limit_selection: false operator_list: { } - defaults: - filters: false - filter_groups: false - title: false - sitename_title: false filter_groups: operator: AND groups: 1: AND + row: + type: node_rss + options: { } + defaults: + title: false + filters: false + filter_groups: false + sitename_title: false + display_extenders: { } path: announcements/rss.xml + sitename_title: false displays: block_1: block_1 default: '0' - title: Announcements - sitename_title: false cache_metadata: max-age: -1 contexts: From 07d4abd0ef2cbd756baa066d71b855f33b269fb4 Mon Sep 17 00:00:00 2001 From: James O'Toole Date: Fri, 28 Jan 2022 15:29:40 -0800 Subject: [PATCH 3/4] Update views.view.content_related_announcements.yml --- .../config/install/views.view.content_related_announcements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_related_announcements.yml b/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_related_announcements.yml index ec09096..a5b1d99 100644 --- a/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_related_announcements.yml +++ b/ubc_announcement/modules/ubc_announcement_views/config/install/views.view.content_related_announcements.yml @@ -58,7 +58,7 @@ display: style: type: html_list options: - row_class: 'mb-8 md--mb-0 md--w-1/2 lg--w-1/4' + row_class: 'mb-8 md--mb-0 md--w-half lg--w-one-quarter' default_row_class: false uses_fields: false type: ul From 13f30bc6d3ffa29e6bbbf818495631c3eb303475 Mon Sep 17 00:00:00 2001 From: James O'Toole Date: Fri, 4 Feb 2022 14:16:41 -0800 Subject: [PATCH 4/4] Update paragraph entities --- ....icon_card.field_paragraph_card_colour.yml | 28 +++++++++++++++++++ .../ubc_paragraph_entities.info.yml | 1 + 2 files changed, 29 insertions(+) create mode 100644 ubc_paragraph_entities/config/install/field.field.paragraph.icon_card.field_paragraph_card_colour.yml diff --git a/ubc_paragraph_entities/config/install/field.field.paragraph.icon_card.field_paragraph_card_colour.yml b/ubc_paragraph_entities/config/install/field.field.paragraph.icon_card.field_paragraph_card_colour.yml new file mode 100644 index 0000000..ac9c050 --- /dev/null +++ b/ubc_paragraph_entities/config/install/field.field.paragraph.icon_card.field_paragraph_card_colour.yml @@ -0,0 +1,28 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_paragraph_card_colour + - paragraphs.paragraphs_type.icon_card + - taxonomy.vocabulary.admin_background_color_settings +id: paragraph.icon_card.field_paragraph_card_colour +field_name: field_paragraph_card_colour +entity_type: paragraph +bundle: icon_card +label: 'Card Colour' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + admin_background_color_settings: admin_background_color_settings + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/ubc_paragraph_entities/ubc_paragraph_entities.info.yml b/ubc_paragraph_entities/ubc_paragraph_entities.info.yml index 5ce09d5..ae50d77 100755 --- a/ubc_paragraph_entities/ubc_paragraph_entities.info.yml +++ b/ubc_paragraph_entities/ubc_paragraph_entities.info.yml @@ -18,6 +18,7 @@ dependencies: - drupal:toolbar - drupal:twig_tweak - ubc_image_styles:ubc_image_styles + - ubc_media_entities:ubc_media_entities - ubc_taxonomy_terms_admin:ubc_taxonomy_terms_admin core: '8.x' core_version_requirement: ^8 || ^9