From d8e97a42b4de6a22a3c2ca84a4ea5e4b8a4aff46 Mon Sep 17 00:00:00 2001 From: Kevin Walsh Date: Tue, 4 Feb 2020 21:57:59 -0500 Subject: [PATCH 1/2] VACMS-821: Update epic issue template. --- .github/ISSUE_TEMPLATE/cms-epic.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/cms-epic.md b/.github/ISSUE_TEMPLATE/cms-epic.md index 0e1a3af9af..72e33bb94e 100644 --- a/.github/ISSUE_TEMPLATE/cms-epic.md +++ b/.github/ISSUE_TEMPLATE/cms-epic.md @@ -57,6 +57,7 @@ This is particularly relevant for feature launches, or for making changes to the * Analysis of the drupal landscape * Possible implementation(s) * Proof of concept or prototype +* UX writing discovery - [ ] User research - [ ] Design From 7dac80a5c1b584337c6637eccc55cb0089191cef Mon Sep 17 00:00:00 2001 From: Ethan Teague Date: Wed, 5 Feb 2020 12:26:19 -0500 Subject: [PATCH 2/2] VAGOV-6370: Adding meta fieldsets to node forms. (#887) * VAGOV-6370: Adding meta fieldsets to node forms. * VAGOV-6370: Updating content model tests. Co-authored-by: Steve Wirt --- ...entity_form_display.node.event.default.yml | 46 ++++++++++++------- ...orm_display.node.event_listing.default.yml | 26 ++++++++--- ...ode.health_care_local_facility.default.yml | 39 ++++++++++------ ...health_care_region_detail_page.default.yml | 42 +++++++++++------ ...y.node.health_care_region_page.default.yml | 31 ++++++------- ...y.node.health_services_listing.default.yml | 28 +++++++---- ...form_display.node.landing_page.default.yml | 22 +++++++-- ...display.node.locations_listing.default.yml | 26 ++++++++--- ...ntity_form_display.node.office.default.yml | 22 +++++++-- ...rm_display.node.outreach_asset.default.yml | 19 ++++++-- ....entity_form_display.node.page.default.yml | 36 ++++++++++----- ...rm_display.node.person_profile.default.yml | 16 ++++++- ...orm_display.node.story_listing.default.yml | 26 ++++++++--- ...eld.field.node.event.field_description.yml | 2 +- ..._care_local_facility.field_description.yml | 2 +- ...e_region_detail_page.field_description.yml | 2 +- ...lth_care_region_page.field_description.yml | 2 +- ...ld.node.landing_page.field_description.yml | 2 +- ...ld.field.node.office.field_description.yml | 2 +- ....node.outreach_asset.field_description.yml | 2 +- ...ield.field.node.page.field_description.yml | 2 +- ....node.person_profile.field_description.yml | 2 +- .../drupal-spec-tool/content_model.feature | 18 ++++---- 23 files changed, 280 insertions(+), 135 deletions(-) diff --git a/config/sync/core.entity_form_display.node.event.default.yml b/config/sync/core.entity_form_display.node.event.default.yml index 71c8b0d394..c8949788c3 100644 --- a/config/sync/core.entity_form_display.node.event.default.yml +++ b/config/sync/core.entity_form_display.node.event.default.yml @@ -90,7 +90,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 17 + weight: 15 format_type: details format_settings: id: '' @@ -130,6 +130,19 @@ third_party_settings: weight: '0' label: 'Feature This Content' region: content + group_meta_tags: + children: + - field_description + parent_name: '' + weight: 5 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.event.default targetEntityType: node bundle: event @@ -137,7 +150,7 @@ mode: default content: created: type: datetime_timestamp - weight: 14 + weight: 11 region: content settings: { } third_party_settings: { } @@ -150,20 +163,19 @@ content: type: text_textarea region: content field_address: - weight: 40 - settings: - default_country: US + weight: 16 + settings: { } third_party_settings: { } type: address_default region: content field_administration: - weight: 16 + weight: 21 settings: { } third_party_settings: { } type: options_select region: content field_body: - weight: 5 + weight: 4 settings: rows: 5 placeholder: '' @@ -212,7 +224,7 @@ content: type: boolean_checkbox region: content field_facility_location: - weight: 37 + weight: 13 settings: { } third_party_settings: { } type: options_select @@ -233,7 +245,7 @@ content: type: link_default region: content field_location_humanreadable: - weight: 39 + weight: 15 settings: size: 60 placeholder: '' @@ -241,19 +253,19 @@ content: type: string_textfield region: content field_location_type: - weight: 36 + weight: 12 settings: { } third_party_settings: { } type: options_select region: content field_media: type: media_library_widget - weight: 4 + weight: 3 settings: { } region: content third_party_settings: { } field_meta_tags: - weight: 12 + weight: 14 settings: { } third_party_settings: { } type: metatag_firehose @@ -271,7 +283,7 @@ content: type: options_select region: content field_url_of_an_online_event: - weight: 38 + weight: 14 settings: placeholder_url: '' placeholder_title: '' @@ -287,13 +299,13 @@ content: third_party_settings: { } path: type: path - weight: 15 + weight: 12 region: content settings: { } third_party_settings: { } revision_log: type: hide_revision_field_log_widget - weight: 15 + weight: 16 region: content settings: show: true @@ -313,7 +325,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 13 + weight: 10 settings: match_operator: CONTAINS size: 60 @@ -321,7 +333,7 @@ content: region: content third_party_settings: { } url_redirects: - weight: 16 + weight: 13 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.event_listing.default.yml b/config/sync/core.entity_form_display.node.event_listing.default.yml index 498194f1aa..ec230d03a4 100644 --- a/config/sync/core.entity_form_display.node.event_listing.default.yml +++ b/config/sync/core.entity_form_display.node.event_listing.default.yml @@ -23,7 +23,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 3 + weight: 4 format_type: details_sidebar format_settings: id: '' @@ -39,7 +39,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 2 + weight: 3 format_type: fieldset format_settings: id: '' @@ -52,8 +52,6 @@ third_party_settings: group_meta: children: - title - - field_meta_title - - field_description - field_intro_text parent_name: '' weight: 1 @@ -63,7 +61,21 @@ third_party_settings: required_fields: true id: '' classes: '' - label: 'Title, Meta tags, and Intro' + label: 'Title and summary' + region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 2 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' region: content id: node.event_listing.default targetEntityType: node @@ -99,7 +111,7 @@ content: type: string_textarea region: content field_meta_tags: - weight: 5 + weight: 6 settings: { } third_party_settings: { } type: metatag_firehose @@ -132,7 +144,7 @@ content: third_party_settings: { } path: type: path - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml b/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml index 98f6faefff..6c7c43ffa8 100644 --- a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml +++ b/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml @@ -48,7 +48,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 7 + weight: 8 format_type: details_sidebar format_settings: id: '' @@ -63,7 +63,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 8 + weight: 9 format_type: fieldset format_settings: id: '' @@ -76,7 +76,7 @@ third_party_settings: children: - field_location_services parent_name: '' - weight: 5 + weight: 6 format_type: details format_settings: id: '' @@ -90,7 +90,7 @@ third_party_settings: - field_region_page - field_main_location parent_name: '' - weight: 3 + weight: 4 format_type: fieldset format_settings: id: '' @@ -101,9 +101,7 @@ third_party_settings: region: content group_title_and_summary: children: - - field_meta_title - field_nickname_for_this_facility - - field_description - field_intro_text - field_media parent_name: '' @@ -124,7 +122,7 @@ third_party_settings: - field_flickr - field_email_subscription parent_name: '' - weight: 4 + weight: 5 format_type: fieldset format_settings: id: '' @@ -158,7 +156,7 @@ third_party_settings: - field_operating_status_facility - field_operating_status_more_info parent_name: '' - weight: 2 + weight: 3 format_type: fieldset format_settings: id: '' @@ -167,6 +165,20 @@ third_party_settings: required_fields: true label: 'Operating status' region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 2 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.health_care_local_facility.default targetEntityType: node bundle: health_care_local_facility @@ -174,8 +186,7 @@ mode: default content: field_address: weight: 14 - settings: - default_country: null + settings: { } third_party_settings: { } type: address_default region: content @@ -186,7 +197,7 @@ content: type: options_select region: content field_description: - weight: 4 + weight: 3 settings: size: 120 placeholder: '' @@ -299,7 +310,7 @@ content: type: telephone_default region: content field_meta_tags: - weight: 9 + weight: 10 settings: { } third_party_settings: { } type: metatag_firehose @@ -319,7 +330,7 @@ content: type: string_textfield_with_counter region: content field_nickname_for_this_facility: - weight: 3 + weight: 4 settings: size: 120 placeholder: '' @@ -369,7 +380,7 @@ content: third_party_settings: { } path: type: path - weight: 6 + weight: 7 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.health_care_region_detail_page.default.yml b/config/sync/core.entity_form_display.node.health_care_region_detail_page.default.yml index 362df2818f..5580ee4518 100644 --- a/config/sync/core.entity_form_display.node.health_care_region_detail_page.default.yml +++ b/config/sync/core.entity_form_display.node.health_care_region_detail_page.default.yml @@ -31,7 +31,7 @@ third_party_settings: - field_office - field_administration parent_name: '' - weight: 11 + weight: 12 format_type: details_sidebar format_settings: id: '' @@ -46,7 +46,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 12 + weight: 13 format_type: fieldset format_settings: id: '' @@ -58,8 +58,6 @@ third_party_settings: group_page_introduction: children: - title - - field_meta_title - - field_description - field_intro_text parent_name: '' weight: 0 @@ -75,7 +73,7 @@ third_party_settings: children: - field_alert parent_name: '' - weight: 1 + weight: 2 format_type: fieldset format_settings: description: 'Alerts draw attention to information that may be critical to a veteran, family member, or caregiver. You can create a new alert, or reuse an existing one.' @@ -88,7 +86,7 @@ third_party_settings: children: - field_table_of_contents_boolean parent_name: '' - weight: 3 + weight: 4 format_type: details format_settings: description: '' @@ -98,6 +96,20 @@ third_party_settings: open: false label: 'Include table of contents?' region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 1 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.health_care_region_detail_page.default targetEntityType: node bundle: health_care_region_detail_page @@ -105,7 +117,7 @@ mode: default content: created: type: datetime_timestamp - weight: 7 + weight: 8 region: content settings: { } third_party_settings: { } @@ -122,7 +134,7 @@ content: type: options_select region: content field_content_block: - weight: 4 + weight: 5 settings: title: 'Content block' title_plural: 'Content blocks' @@ -158,7 +170,7 @@ content: type: string_textfield_with_counter region: content field_featured_content: - weight: 2 + weight: 3 settings: title: 'Content block' title_plural: 'Content blocks' @@ -190,7 +202,7 @@ content: type: string_textarea_with_counter region: content field_meta_tags: - weight: 13 + weight: 14 settings: { } third_party_settings: { } type: metatag_firehose @@ -216,7 +228,7 @@ content: type: options_select region: content field_related_links: - weight: 5 + weight: 6 settings: title: 'Related link' title_plural: 'Related links' @@ -249,7 +261,7 @@ content: third_party_settings: { } path: type: path - weight: 8 + weight: 9 region: content settings: { } third_party_settings: { } @@ -269,7 +281,7 @@ content: type: boolean_checkbox settings: display_label: true - weight: 10 + weight: 11 region: content third_party_settings: { } title: @@ -288,7 +300,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 6 + weight: 7 settings: match_operator: CONTAINS size: 60 @@ -296,7 +308,7 @@ content: region: content third_party_settings: { } url_redirects: - weight: 9 + weight: 10 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.health_care_region_page.default.yml b/config/sync/core.entity_form_display.node.health_care_region_page.default.yml index fae7c98a93..302c2a34c7 100644 --- a/config/sync/core.entity_form_display.node.health_care_region_page.default.yml +++ b/config/sync/core.entity_form_display.node.health_care_region_page.default.yml @@ -50,7 +50,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 11 + weight: 12 format_type: details_sidebar format_settings: id: '' @@ -65,7 +65,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 12 + weight: 13 format_type: fieldset format_settings: id: '' @@ -79,7 +79,7 @@ third_party_settings: - field_locations_intro_blurb - field_other_va_locations parent_name: '' - weight: 5 + weight: 6 format_type: details format_settings: description: "

To add locations to the \"Our Locations\" page, create a facility listing for each one.This section also allows you to add other content to the \"Our Locations\" page.

\r\n\r\n\r\n" @@ -95,7 +95,7 @@ third_party_settings: - field_clinical_health_care_servi - field_clinical_health_services parent_name: '' - weight: 7 + weight: 8 format_type: details format_settings: description: 'This content will appear on the Health Services page, (eg va.gov/pittsburgh-health-care/health-services). ' @@ -110,7 +110,7 @@ third_party_settings: - group_online_appointments - field_related_links parent_name: '' - weight: 10 + weight: 11 format_type: details format_settings: id: '' @@ -139,7 +139,7 @@ third_party_settings: - field_intro_text_press_releases - field_press_release_blurb parent_name: '' - weight: 9 + weight: 10 format_type: details format_settings: required_fields: true @@ -154,7 +154,7 @@ third_party_settings: - group_govdelivery_email_lists - group_s parent_name: '' - weight: 6 + weight: 7 format_type: details format_settings: description: 'This will populate the "Get updates" from us block on the health care system page and its facility pages. ' @@ -187,7 +187,6 @@ third_party_settings: - field_vamc_system_official_name - field_nickname_for_this_facility - field_intro_text - - group_meta_tags parent_name: '' weight: 0 format_type: fieldset @@ -203,7 +202,7 @@ third_party_settings: - field_intro_text_leadership - field_leadership parent_name: '' - weight: 8 + weight: 9 format_type: details format_settings: id: '' @@ -244,8 +243,8 @@ third_party_settings: children: - field_meta_title - field_description - parent_name: group_title_and_summary - weight: 6 + parent_name: '' + weight: 1 format_type: fieldset format_settings: id: '' @@ -426,12 +425,12 @@ content: region: content field_media: type: media_library_widget - weight: 1 + weight: 2 settings: { } region: content third_party_settings: { } field_meta_tags: - weight: 13 + weight: 14 settings: { } third_party_settings: { } type: metatag_firehose @@ -531,7 +530,7 @@ content: third_party_settings: { } path: type: path - weight: 2 + weight: 3 region: content settings: { } third_party_settings: { } @@ -551,7 +550,7 @@ content: type: boolean_checkbox settings: display_label: true - weight: 4 + weight: 5 region: content third_party_settings: { } title: @@ -563,7 +562,7 @@ content: placeholder: '' third_party_settings: { } url_redirects: - weight: 3 + weight: 4 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.health_services_listing.default.yml b/config/sync/core.entity_form_display.node.health_services_listing.default.yml index d11e500774..d672ea4e03 100644 --- a/config/sync/core.entity_form_display.node.health_services_listing.default.yml +++ b/config/sync/core.entity_form_display.node.health_services_listing.default.yml @@ -25,7 +25,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 4 + weight: 5 format_type: details_sidebar format_settings: id: '' @@ -41,7 +41,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 3 + weight: 4 format_type: fieldset format_settings: id: '' @@ -54,8 +54,6 @@ third_party_settings: group_meta: children: - title - - field_meta_title - - field_description - field_intro_text parent_name: '' weight: 1 @@ -65,13 +63,13 @@ third_party_settings: required_fields: true id: '' classes: '' - label: 'Title, Meta tags, and Intro' + label: 'Title and summary' region: content group_featured_content: children: - field_featured_content_healthser parent_name: '' - weight: 2 + weight: 3 format_type: fieldset format_settings: id: '' @@ -80,6 +78,20 @@ third_party_settings: required_fields: true label: 'Featured content' region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 2 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.health_services_listing.default targetEntityType: node bundle: health_services_listing @@ -126,7 +138,7 @@ content: type: string_textarea region: content field_meta_tags: - weight: 6 + weight: 7 settings: { } third_party_settings: { } type: metatag_firehose @@ -159,7 +171,7 @@ content: third_party_settings: { } path: type: path - weight: 5 + weight: 6 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.landing_page.default.yml b/config/sync/core.entity_form_display.node.landing_page.default.yml index 087a01e405..6d9435d376 100644 --- a/config/sync/core.entity_form_display.node.landing_page.default.yml +++ b/config/sync/core.entity_form_display.node.landing_page.default.yml @@ -99,8 +99,6 @@ third_party_settings: - field_title_icon - title - field_home_page_hub_label - - field_meta_title - - field_description - field_teaser_text - field_intro_text parent_name: '' @@ -117,7 +115,7 @@ third_party_settings: children: - field_alert parent_name: '' - weight: 1 + weight: 2 format_type: fieldset format_settings: description: 'Crisis alerts draw attention to information that will be useful to veterans experiencing an active crisis. You can create a new crisis alert, or reuse an existing one.' @@ -130,7 +128,7 @@ third_party_settings: children: - field_related_links parent_name: '' - weight: 3 + weight: 4 format_type: fieldset format_settings: description: '' @@ -139,6 +137,20 @@ third_party_settings: classes: '' label: 'Related content' region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 1 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.landing_page.default targetEntityType: node bundle: landing_page @@ -246,7 +258,7 @@ content: type: entity_reference_paragraphs region: content field_spokes: - weight: 2 + weight: 3 settings: title: Spoke title_plural: Spokes diff --git a/config/sync/core.entity_form_display.node.locations_listing.default.yml b/config/sync/core.entity_form_display.node.locations_listing.default.yml index 3e0cc0b53f..4ade0807ce 100644 --- a/config/sync/core.entity_form_display.node.locations_listing.default.yml +++ b/config/sync/core.entity_form_display.node.locations_listing.default.yml @@ -23,7 +23,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 3 + weight: 4 format_type: details_sidebar format_settings: id: '' @@ -39,7 +39,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 2 + weight: 3 format_type: fieldset format_settings: id: '' @@ -52,8 +52,6 @@ third_party_settings: group_meta: children: - title - - field_meta_title - - field_description - field_intro_text parent_name: '' weight: 1 @@ -63,7 +61,21 @@ third_party_settings: required_fields: true id: '' classes: '' - label: 'Title, Meta tags, and Intro' + label: 'Title and summary' + region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 2 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' region: content id: node.locations_listing.default targetEntityType: node @@ -99,7 +111,7 @@ content: type: string_textarea region: content field_meta_tags: - weight: 5 + weight: 6 settings: { } third_party_settings: { } type: metatag_firehose @@ -132,7 +144,7 @@ content: third_party_settings: { } path: type: path - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.office.default.yml b/config/sync/core.entity_form_display.node.office.default.yml index 2258d55cb6..bbc31bf1ec 100644 --- a/config/sync/core.entity_form_display.node.office.default.yml +++ b/config/sync/core.entity_form_display.node.office.default.yml @@ -23,7 +23,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 6 + weight: 7 format_type: details_sidebar format_settings: id: '' @@ -34,6 +34,20 @@ third_party_settings: weight: '-10' label: Governance region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 6 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.office.default targetEntityType: node bundle: office @@ -62,7 +76,7 @@ content: type: string_textfield region: content field_meta_tags: - weight: 16 + weight: 10 settings: { } third_party_settings: { } type: metatag_firehose @@ -83,7 +97,7 @@ content: region: content moderation_state: type: moderation_state_default - weight: 7 + weight: 8 settings: { } region: content third_party_settings: { } @@ -95,7 +109,7 @@ content: third_party_settings: { } revision_log: type: hide_revision_field_log_widget - weight: 8 + weight: 9 region: content settings: show: true diff --git a/config/sync/core.entity_form_display.node.outreach_asset.default.yml b/config/sync/core.entity_form_display.node.outreach_asset.default.yml index c7a942c036..763d232d26 100644 --- a/config/sync/core.entity_form_display.node.outreach_asset.default.yml +++ b/config/sync/core.entity_form_display.node.outreach_asset.default.yml @@ -48,6 +48,19 @@ third_party_settings: required_fields: true label: 'Editorial workflow' region: content + group_meta_tags: + children: + - field_description + parent_name: '' + weight: 13 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.outreach_asset.default targetEntityType: node bundle: outreach_asset @@ -87,18 +100,18 @@ content: region: content field_media: type: media_library_widget - weight: 12 + weight: 11 settings: { } region: content third_party_settings: { } field_meta_tags: - weight: 13 + weight: 12 settings: { } third_party_settings: { } type: metatag_firehose region: content field_office: - weight: 11 + weight: 10 settings: { } third_party_settings: { } type: options_select diff --git a/config/sync/core.entity_form_display.node.page.default.yml b/config/sync/core.entity_form_display.node.page.default.yml index 55206a8eca..33060f2f4d 100644 --- a/config/sync/core.entity_form_display.node.page.default.yml +++ b/config/sync/core.entity_form_display.node.page.default.yml @@ -32,7 +32,7 @@ third_party_settings: - field_administration - field_plainlanguage_date parent_name: '' - weight: 5 + weight: 6 format_type: details_sidebar format_settings: open: true @@ -46,7 +46,7 @@ third_party_settings: children: - field_alert parent_name: '' - weight: 1 + weight: 2 format_type: fieldset format_settings: description: 'Alerts draw attention to information that may be critical to a veteran, family member, or caregiver. You can create a new alert, or reuse an existing one.' @@ -60,7 +60,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 6 + weight: 7 format_type: fieldset format_settings: open: true @@ -73,8 +73,6 @@ third_party_settings: group_title_and_summary: children: - title - - field_meta_title - - field_description - field_intro_text parent_name: '' weight: 0 @@ -86,6 +84,20 @@ third_party_settings: required_fields: false label: 'Title, metatags, and introduction' region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 1 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content _core: default_config_hash: 7fm6IQg6gNfLHHQlwMKSUqMSbPhM8O91P6nqQkjtH80 id: node.page.default @@ -95,7 +107,7 @@ mode: default content: created: type: datetime_timestamp - weight: 7 + weight: 8 settings: { } third_party_settings: { } region: content @@ -113,7 +125,7 @@ content: region: content field_content_block: type: paragraphs_browser - weight: 3 + weight: 4 settings: title: 'Content block' title_plural: 'Content blocks' @@ -149,7 +161,7 @@ content: region: content field_featured_content: type: paragraphs - weight: 2 + weight: 3 settings: title: 'Content block' title_plural: 'Content blocks' @@ -181,7 +193,7 @@ content: field_meta_tags: type: metatag_firehose region: content - weight: 9 + weight: 10 settings: { } third_party_settings: { } field_meta_title: @@ -206,7 +218,7 @@ content: region: content field_related_links: type: paragraphs - weight: 4 + weight: 5 settings: title: 'Related links' title_plural: 'Related links' @@ -230,7 +242,7 @@ content: third_party_settings: { } path: type: path - weight: 8 + weight: 9 settings: { } third_party_settings: { } region: content @@ -261,7 +273,7 @@ content: third_party_settings: { } region: content url_redirects: - weight: 10 + weight: 11 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.person_profile.default.yml b/config/sync/core.entity_form_display.node.person_profile.default.yml index 13752d1975..9b23690431 100644 --- a/config/sync/core.entity_form_display.node.person_profile.default.yml +++ b/config/sync/core.entity_form_display.node.person_profile.default.yml @@ -64,7 +64,6 @@ third_party_settings: - field_name_first - field_last_name - field_suffix - - field_description parent_name: '' weight: 2 format_type: fieldset @@ -110,7 +109,7 @@ third_party_settings: - field_body - field_complete_biography parent_name: '' - weight: 3 + weight: 4 format_type: fieldset format_settings: id: '' @@ -119,6 +118,19 @@ third_party_settings: required_fields: true label: Bio region: content + group_meta_tags: + children: + - field_description + parent_name: '' + weight: 3 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' + region: content id: node.person_profile.default targetEntityType: node bundle: person_profile diff --git a/config/sync/core.entity_form_display.node.story_listing.default.yml b/config/sync/core.entity_form_display.node.story_listing.default.yml index 7e5ab0c5b0..3b339421de 100644 --- a/config/sync/core.entity_form_display.node.story_listing.default.yml +++ b/config/sync/core.entity_form_display.node.story_listing.default.yml @@ -23,7 +23,7 @@ third_party_settings: children: - field_administration parent_name: '' - weight: 3 + weight: 4 format_type: details_sidebar format_settings: id: '' @@ -39,7 +39,7 @@ third_party_settings: - moderation_state - revision_log parent_name: '' - weight: 2 + weight: 3 format_type: fieldset format_settings: id: '' @@ -52,8 +52,6 @@ third_party_settings: group_meta: children: - title - - field_meta_title - - field_description - field_intro_text parent_name: '' weight: 1 @@ -63,7 +61,21 @@ third_party_settings: required_fields: true id: '' classes: '' - label: 'Title, Meta tags, and Intro' + label: 'Title and summary' + region: content + group_meta_tags: + children: + - field_meta_title + - field_description + parent_name: '' + weight: 2 + format_type: fieldset + format_settings: + id: '' + classes: '' + description: '' + required_fields: true + label: 'Meta Tags' region: content id: node.story_listing.default targetEntityType: node @@ -99,7 +111,7 @@ content: type: string_textarea region: content field_meta_tags: - weight: 5 + weight: 6 settings: { } third_party_settings: { } type: metatag_firehose @@ -132,7 +144,7 @@ content: third_party_settings: { } path: type: path - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } diff --git a/config/sync/field.field.node.event.field_description.yml b/config/sync/field.field.node.event.field_description.yml index 8628577a75..0daafe8c3b 100644 --- a/config/sync/field.field.node.event.field_description.yml +++ b/config/sync/field.field.node.event.field_description.yml @@ -9,7 +9,7 @@ id: node.event.field_description field_name: field_description entity_type: node bundle: event -label: 'A brief (ideally one sentence) summary of the event' +label: 'Meta description' description: 'This gives the user an overview of the event in teaser views (like calendars or sidebar lists), and when the event is shared on social media.' required: false translatable: true diff --git a/config/sync/field.field.node.health_care_local_facility.field_description.yml b/config/sync/field.field.node.health_care_local_facility.field_description.yml index c390aca4ef..57620dd6ad 100644 --- a/config/sync/field.field.node.health_care_local_facility.field_description.yml +++ b/config/sync/field.field.node.health_care_local_facility.field_description.yml @@ -9,7 +9,7 @@ id: node.health_care_local_facility.field_description field_name: field_description entity_type: node bundle: health_care_local_facility -label: Description +label: 'Meta description' description: '

This text appears search results, social media shares, and may appear in teaser listings, and should include a brief (ideally one sentence) summary of the topic of this page.

' required: true translatable: true diff --git a/config/sync/field.field.node.health_care_region_detail_page.field_description.yml b/config/sync/field.field.node.health_care_region_detail_page.field_description.yml index 27a4e5fe63..a088d56cdb 100644 --- a/config/sync/field.field.node.health_care_region_detail_page.field_description.yml +++ b/config/sync/field.field.node.health_care_region_detail_page.field_description.yml @@ -9,7 +9,7 @@ id: node.health_care_region_detail_page.field_description field_name: field_description entity_type: node bundle: health_care_region_detail_page -label: Summary +label: 'Meta description' description: "

This text appears search results, social media shares, and may appear in teaser listings, and should include a brief (ideally one sentence) summary of the topic of this page.

\r\n \r\n

Like this: \"VA provides extensive mental health services, including same-day care.\"
Not like this: \"Find out how to get started with VA mental health services for Veterans.\"

\r\n" required: true translatable: true diff --git a/config/sync/field.field.node.health_care_region_page.field_description.yml b/config/sync/field.field.node.health_care_region_page.field_description.yml index f77e0197ea..d5aeea13f9 100644 --- a/config/sync/field.field.node.health_care_region_page.field_description.yml +++ b/config/sync/field.field.node.health_care_region_page.field_description.yml @@ -9,7 +9,7 @@ id: node.health_care_region_page.field_description field_name: field_description entity_type: node bundle: health_care_region_page -label: Description +label: 'Meta description' description: "

This text appears search results, social media shares, and may appear in teaser listings, and should include a brief (ideally one sentence) summary of the topic of this page.

\r\n" required: true translatable: true diff --git a/config/sync/field.field.node.landing_page.field_description.yml b/config/sync/field.field.node.landing_page.field_description.yml index 7e13a4a3a4..60162adad8 100644 --- a/config/sync/field.field.node.landing_page.field_description.yml +++ b/config/sync/field.field.node.landing_page.field_description.yml @@ -9,7 +9,7 @@ id: node.landing_page.field_description field_name: field_description entity_type: node bundle: landing_page -label: Description +label: 'Meta description' description: "This text appears search results, social media shares, and may appear in teaser listings, and should include a brief (ideally one sentence) summary of the topic of this page. See content style guide for more guidance.\r\n\r\n" required: true translatable: true diff --git a/config/sync/field.field.node.office.field_description.yml b/config/sync/field.field.node.office.field_description.yml index 5bff777a4d..cc890d93ef 100644 --- a/config/sync/field.field.node.office.field_description.yml +++ b/config/sync/field.field.node.office.field_description.yml @@ -9,7 +9,7 @@ id: node.office.field_description field_name: field_description entity_type: node bundle: office -label: Description +label: 'Meta description' description: '' required: false translatable: true diff --git a/config/sync/field.field.node.outreach_asset.field_description.yml b/config/sync/field.field.node.outreach_asset.field_description.yml index db391afc59..ba1da1c777 100644 --- a/config/sync/field.field.node.outreach_asset.field_description.yml +++ b/config/sync/field.field.node.outreach_asset.field_description.yml @@ -9,7 +9,7 @@ id: node.outreach_asset.field_description field_name: field_description entity_type: node bundle: outreach_asset -label: 'A brief (ideally one sentence) summary of this asset' +label: 'Meta description' description: 'This description helps a user understand what the asset is without having to download it. It may also be displayed when the document is shared on social media. ' required: false translatable: true diff --git a/config/sync/field.field.node.page.field_description.yml b/config/sync/field.field.node.page.field_description.yml index 579421184c..77fc71d815 100644 --- a/config/sync/field.field.node.page.field_description.yml +++ b/config/sync/field.field.node.page.field_description.yml @@ -9,7 +9,7 @@ id: node.page.field_description field_name: field_description entity_type: node bundle: page -label: Description +label: 'Meta description' description: '

This text appears search results, social media shares, and may appear in teaser listings, and should include a brief (ideally one sentence) summary of the topic of this page. See content style guide for more guidance.' required: true translatable: false diff --git a/config/sync/field.field.node.person_profile.field_description.yml b/config/sync/field.field.node.person_profile.field_description.yml index f4db746d36..83eee41c8b 100644 --- a/config/sync/field.field.node.person_profile.field_description.yml +++ b/config/sync/field.field.node.person_profile.field_description.yml @@ -9,7 +9,7 @@ id: node.person_profile.field_description field_name: field_description entity_type: node bundle: person_profile -label: 'Job Title' +label: 'Meta description' description: 'Title Case. If the person holds multiple positions, include them all, separated by commas' required: false translatable: true diff --git a/tests/behat/drupal-spec-tool/content_model.feature b/tests/behat/drupal-spec-tool/content_model.feature index e89c3a422f..08a9bf99b9 100644 --- a/tests/behat/drupal-spec-tool/content_model.feature +++ b/tests/behat/drupal-spec-tool/content_model.feature @@ -68,7 +68,7 @@ Feature: Content model | Content type | Benefits detail page | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Benefits detail page | Alert | field_alert | Entity reference | | 1 | Select list | | | Content type | Benefits detail page | Main content | field_content_block | Entity reference revisions | Required | Unlimited | Paragraphs Browser EXPERIMENTAL | | -| Content type | Benefits detail page | Description | field_description | Text (plain) | Required | 1 | Textfield with counter | | +| Content type | Benefits detail page | Meta description | field_description | Text (plain) | Required | 1 | Textfield with counter | | | Content type | Benefits detail page | Featured content | field_featured_content | Entity reference revisions | | Unlimited | Paragraphs EXPERIMENTAL | | | Content type | Benefits detail page | Intro text | field_intro_text | Text (plain, long) | Required | 1 | Textarea (multiple rows) with counter | | | Content type | Benefits detail page | Meta tags | field_meta_tags | Meta tags | | 1 | Advanced meta tags form | | @@ -78,7 +78,7 @@ Feature: Content model | Content type | Benefits detail page | Related Links | field_related_links | Entity reference revisions | | 1 | Paragraphs EXPERIMENTAL | | | Content type | Benefits hub landing page | Owner | field_administration | Entity reference | Required | 1 | Select list | | | Content type | Benefits hub landing page | Alert | field_alert | Entity reference | | 1 | Select list | Translatable | -| Content type | Benefits hub landing page | Description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | +| Content type | Benefits hub landing page | Meta description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | | Content type | Benefits hub landing page | Home page hub label | field_home_page_hub_label | Text (plain) | | 1 | Textfield | | | Content type | Benefits hub landing page | Intro text | field_intro_text | Text (plain, long) | Required | 1 | Text area (multiple rows) | Translatable | | Content type | Benefits hub landing page | Links for non-veterans | field_links | Link | | Unlimited | Linkit | | @@ -95,7 +95,7 @@ Feature: Content model | Content type | Detail Page | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Detail Page | Alert | field_alert | Entity reference | | 1 | Select list | Translatable | | Content type | Detail Page | Main content | field_content_block | Entity reference revisions | | Unlimited | Paragraphs Browser EXPERIMENTAL | Translatable | -| Content type | Detail Page | Summary | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | +| Content type | Detail Page | Meta description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | | Content type | Detail Page | Featured content | field_featured_content | Entity reference revisions | | Unlimited | Paragraphs EXPERIMENTAL | Translatable | | Content type | Detail Page | Intro text | field_intro_text | Text (plain, long) | Required | 1 | Textarea (multiple rows) with counter | Translatable | | Content type | Detail Page | Meta tags | field_meta_tags | Meta tags | | 1 | Advanced meta tags form | Translatable | @@ -110,7 +110,7 @@ Feature: Content model | Content type | Event | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Event | Full event description | field_body | Text (formatted, long) | | 1 | Text area (multiple rows) | | | Content type | Event | Date and time | field_date | Date range | | 1 | Date and time range | | -| Content type | Event | A brief (ideally one sentence) summary of the event | field_description | Text (plain) | | 1 | Textfield | Translatable | +| Content type | Event | Meta description | field_description | Text (plain) | | 1 | Textfield | Translatable | | Content type | Event | Cost | field_event_cost | Text (plain) | | 1 | Textfield with counter | | | Content type | Event | URL Link Label | field_event_cta | List (text) | | 1 | Select list | | | Content type | Event | Registration required | field_event_registrationrequired | Boolean | | 1 | Single on/off checkbox | | @@ -142,12 +142,12 @@ Feature: Content model | Content type | News release | Release date | field_release_date | Date | | 1 | Date and time | | | Content type | Office | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Office | Body | field_body | Text (formatted, long) | | 1 | Text area (multiple rows) | Translatable | -| Content type | Office | Description | field_description | Text (plain) | | 1 | Textfield | Translatable | +| Content type | Office | Meta description | field_description | Text (plain) | | 1 | Textfield | Translatable | | Content type | Office | Meta tags | field_meta_tags | Meta tags | | 1 | Advanced meta tags form | Translatable | | Content type | Office | Meta title tag | field_meta_title | Text (plain) | Required | 1 | Textfield with counter | Translatable | | Content type | Publication | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Publication | Related Benefits | field_benefits | List (text) | | 1 | Select list | | -| Content type | Publication | A brief (ideally one sentence) summary of this asset | field_description | Text (plain) | | 1 | Textfield | Translatable | +| Content type | Publication | Meta description | field_description | Text (plain) | | 1 | Textfield | Translatable | | Content type | Publication | Format | field_format | List (text) | Required | 1 | Select list | | | Content type | Publication | File or video | field_media | Entity reference | | 1 | Media library | | | Content type | Publication | Meta tags | field_meta_tags | Meta tags | | 1 | Advanced meta tags form | Translatable | @@ -161,7 +161,7 @@ Feature: Content model | Content type | Staff profile | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Staff profile | Bio | field_body | Text (formatted, long) | | 1 | Text area (multiple rows) | Translatable | | Content type | Staff profile | Complete Biography | field_complete_biography | File | | 1 | File | | -| Content type | Staff profile | Job Title | field_description | Text (plain) | | 1 | Textfield | Translatable | +| Content type | Staff profile | Meta description | field_description | Text (plain) | | 1 | Textfield | Translatable | | Content type | Staff profile | Email address | field_email_address | Email | | 1 | Email | | | Content type | Staff profile | Introduction | field_intro_text | Text (plain, long) | | 1 | Textarea (multiple rows) with counter | Translatable | | Content type | Staff profile | Last name | field_last_name | Text (plain) | | 1 | Textfield | | @@ -189,7 +189,7 @@ Feature: Content model | Content type | Support Service | Phone Number | field_phone_number | Telephone number | | 1 | Telephone number | | | Content type | VAMC facility | Address | field_address | Address | | 1 | Address | Translatable | | Content type | VAMC facility | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | -| Content type | VAMC facility | Description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | +| Content type | VAMC facility | Meta description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | | Content type | VAMC facility | Email Subscription | field_email_subscription | Link | | 1 | Linkit | Translatable | | Content type | VAMC facility | Facebook | field_facebook | Link | | 1 | Link | Translatable | | Content type | VAMC facility | Classification | field_facility_classification | List (text) | | 1 | Select list | | @@ -219,7 +219,7 @@ Feature: Content model | Content type | VAMC system | Appointments can be scheduled and viewed online | field_appointments_online | Boolean | | 1 | Single on/off checkbox | | | Content type | VAMC system | Health services intro text | field_clinical_health_care_servi | Text (formatted, long) | | 1 | Text area (multiple rows) | | | Content type | VAMC system | Regional Health Service Offerings. | field_clinical_health_services | Entity reference | | Unlimited | Select list | | -| Content type | VAMC system | Description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | +| Content type | VAMC system | Meta description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | | Content type | VAMC system | Facebook | field_facebook | Link | | 1 | Link | Translatable | | Content type | VAMC system | Featured content on health-services page | field_featured_content_healthser | Entity reference revisions | | 3 | Paragraphs Classic | | | Content type | VAMC system | Flickr | field_flickr | Link | | 1 | Link | Translatable |