Skip to content

Commit

Permalink
Merge branch 'develop' into YALB-1057-quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
nJim authored Sep 17, 2023
2 parents 424daf6 + 8651bc8 commit 2bdce62
Show file tree
Hide file tree
Showing 59 changed files with 1,837 additions and 220 deletions.
10 changes: 8 additions & 2 deletions web/profiles/custom/yalesites_profile/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@
"drupal/media_library_form_element": "^2.0",
"drupal/menu_admin_per_menu": "^1.4",
"drupal/menu_breadcrumb": "^1.16",
"drupal/menu_item_extras": "^3.0",
"drupal/metatag": "^1.19",
"drupal/migrate_plus": "^6.0",
"drupal/migrate_tools": "^6.0",
"drupal/multivalue_form_element": "^1.0@beta",
"drupal/node_revision_delete": "^1.0@RC",
"drupal/override_node_options": "^2.6",
"drupal/pantheon_advanced_page_cache": "^2.1",
Expand All @@ -86,7 +88,7 @@
"drupal/webform": "^6.2@beta",
"drupal/wingsuit_companion": "^2.0@RC",
"jjj/chosen": "^2.2",
"yalesites-org/atomic": "1.18.0",
"yalesites-org/atomic": "1.20.0",
"yalesites-org/yale_cas": "^1.0"
},
"minimum-stability": "dev",
Expand All @@ -109,7 +111,8 @@
},
"drupal/core": {
"plural results summary https://www.drupal.org/project/drupal/issues/2888320": "https://www.drupal.org/files/issues/2021-12-15/2888320-78.patch",
"Prevent media library item overflow https://www.drupal.org/project/drupal/issues/3059955": "https://www.drupal.org/files/issues/2023-03-18/3059955-167.patch"
"Prevent media library item overflow https://www.drupal.org/project/drupal/issues/3059955": "https://www.drupal.org/files/issues/2023-03-18/3059955-167.patch",
"Remove for Drupal 10 - CKEditor 5 should not grow to infinite height https://www.drupal.org/project/drupal/issues/3273755": "https://www.drupal.org/files/issues/2023-07-26/ckeditor-height-fix.patch"
},
"drupal/entity_redirect": {
"fix layout route https://www.drupal.org/project/entity_redirect/issues/3352265": "https://git.drupalcode.org/project/entity_redirect/-/merge_requests/6.patch"
Expand All @@ -129,6 +132,9 @@
"drupal/gin": {
"fix description toggle for CKEditor fields https://www.drupal.org/project/gin/issues/3316265": "https://git.drupalcode.org/project/gin/-/merge_requests/227.patch"
},
"drupal/media_library_form_element": {
"Order Media items https://www.drupal.org/project/media_library_form_element/issues/3168027":"https://www.drupal.org/files/issues/2022-01-22/order_media_items-3168027-8.patch"
},
"drupal/redirect": {
"fix validation issue on adding url redirect": "https://www.drupal.org/files/issues/2023-08-09/3057250-65.patch"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
uuid: 4d9a3d30-51e9-4057-9f6d-99b22f6e367b
langcode: en
status: true
dependencies:
module:
- ys_core
theme:
- atomic
id: yalesitesfooterblock
theme: atomic
region: footer
weight: 0
provider: null
plugin: ys_footer_block
settings:
id: ys_footer_block
label: 'YaleSites Footer Block'
label_display: '0'
provider: ys_core
visibility: { }
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
_core:
default_config_hash: hSAUW7BoAd9YUpKcVKyZpW4wY67g4XZAYlt3Vnz6SVA
enabled_default: 0
default_challenge: recaptcha_v3/form_submission
description: 'This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.'
administration_mode: false
allow_on_admin_pages: false
whitelist_ips: ''
add_captcha_description: true
wrong_captcha_response_message: 'The answer you entered for the CAPTCHA was not correct.'
default_validation: 1
persistence: 1
enable_stats: false
log_wrong_responses: false
enabled_default: 0
allow_on_admin_pages: false
add_captcha_description: true
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- block_content.type.cta_banner
- field.field.block_content.cta_banner.field_heading
- field.field.block_content.cta_banner.field_heading_level
- field.field.block_content.cta_banner.field_instructions
- field.field.block_content.cta_banner.field_link
- field.field.block_content.cta_banner.field_media
Expand Down Expand Up @@ -39,6 +40,12 @@ content:
maxlength_js: 50
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
field_heading_level:
type: options_select
weight: 16
region: content
settings: { }
third_party_settings: { }
field_instructions:
type: markup
weight: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- block_content.type.grand_hero
- field.field.block_content.grand_hero.field_heading
- field.field.block_content.grand_hero.field_heading_level
- field.field.block_content.grand_hero.field_instructions
- field.field.block_content.grand_hero.field_link
- field.field.block_content.grand_hero.field_media
Expand Down Expand Up @@ -39,6 +40,12 @@ content:
maxlength_js: 50
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
field_heading_level:
type: options_select
weight: 10
region: content
settings: { }
third_party_settings: { }
field_instructions:
type: markup
weight: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
uuid: 7163bb95-00d9-47d6-878c-6dafc58f6e69
langcode: en
status: true
dependencies:
config:
- field.field.menu_link_content.main.field_menu_top_level_link_cta
- system.menu.main
module:
- hide_revision_field
- link
- menu_item_extras
id: menu_link_content.main.default
targetEntityType: menu_link_content
bundle: main
mode: default
content:
field_menu_top_level_link_cta:
type: string_textfield
weight: 1
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
revision_log_message:
type: hide_revision_field_log_widget
weight: 4
region: content
settings:
rows: 5
placeholder: ''
show: true
default: ''
permission_based: false
allow_user_settings: true
third_party_settings: { }
simple_sitemap:
weight: 3
region: content
settings: { }
third_party_settings: { }
title:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
view_mode:
type: menu_item_extras_view_mode_selector_select
weight: 2
region: content
settings: { }
third_party_settings: { }
hidden: { }
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- block_content.type.cta_banner
- field.field.block_content.cta_banner.field_heading
- field.field.block_content.cta_banner.field_heading_level
- field.field.block_content.cta_banner.field_instructions
- field.field.block_content.cta_banner.field_link
- field.field.block_content.cta_banner.field_media
Expand All @@ -27,6 +28,13 @@ content:
third_party_settings: { }
weight: 1
region: content
field_heading_level:
type: list_key
label: hidden
settings: { }
third_party_settings: { }
weight: 6
region: content
field_link:
type: link_separate
label: hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- block_content.type.grand_hero
- field.field.block_content.grand_hero.field_heading
- field.field.block_content.grand_hero.field_heading_level
- field.field.block_content.grand_hero.field_instructions
- field.field.block_content.grand_hero.field_link
- field.field.block_content.grand_hero.field_media
Expand All @@ -27,6 +28,13 @@ content:
third_party_settings: { }
weight: 1
region: content
field_heading_level:
type: list_key
label: hidden
settings: { }
third_party_settings: { }
weight: 6
region: content
field_link:
type: link_separate
label: hidden
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
uuid: d53fde33-1a5a-43ac-b379-bc535ea439b9
langcode: en
status: true
dependencies:
config:
- field.field.menu_link_content.main.field_menu_top_level_link_cta
- system.menu.main
id: menu_link_content.main.default
targetEntityType: menu_link_content
bundle: main
mode: default
content:
children:
settings: { }
third_party_settings: { }
weight: 1
region: content
field_menu_top_level_link_cta:
type: string
label: above
settings:
link_to_entity: false
third_party_settings: { }
weight: 2
region: content
hidden:
search_api_excerpt: true
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module:
chosen: 0
chosen_field: 0
chosen_lib: 0
ckeditor: 0
ckeditor5: 0
components: 0
config: 0
config_filter: 0
Expand Down Expand Up @@ -75,6 +75,7 @@ module:
media_library_edit: 0
media_library_form_element: 0
menu_breadcrumb: 0
menu_item_extras: 0
menu_link_content: 0
menu_ui: 0
metatag: 0
Expand All @@ -84,6 +85,7 @@ module:
migrate: 0
migrate_plus: 0
migrate_tools: 0
multivalue_form_element: 0
mysql: 0
node: 0
node_revision_delete: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,53 +1,65 @@
uuid: 23681889-3337-49e5-af58-b61087d99a4f
uuid: 05e16a5b-5ad6-4c77-a471-73fa64268cd1
langcode: en
status: true
dependencies:
config:
- filter.format.basic_html
module:
- ckeditor
- ckeditor5
format: basic_html
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
-
-
name: Formatting
items:
- Bold
- Italic
- JustifyLeft
- JustifyCenter
- JustifyRight
- Format
- '-'
- Paste
- PasteText
-
name: Links
items:
- DrupalLink
- DrupalUnlink
-
name: Lists
items:
- BulletedList
- NumberedList
- Outdent
- Indent
-
name: Media
items:
- Table
-
name: Tools
items:
- Source
- Maximize
- '-'
items:
- bold
- italic
- alignment
- heading
- '|'
- link
- '|'
- bulletedList
- numberedList
- outdent
- indent
- '|'
- insertTable
- '|'
- sourceEditing
plugins:
drupallink:
ckeditor5_heading:
enabled_headings:
- heading2
- heading3
- heading4
- heading5
- heading6
ckeditor5_sourceEditing:
allowed_tags:
- '<cite>'
- '<dl>'
- '<dt>'
- '<dd>'
- '<span>'
- '<blockquote cite>'
- '<ul type>'
- '<ol type>'
- '<h2 id>'
- '<h3 id>'
- '<h4 id>'
- '<h5 id>'
- '<h6 id>'
- '<a hreflang title>'
ckeditor5_list:
reversed: false
startIndex: true
ckeditor5_alignment:
enabled_alignments:
- left
- center
- right
- justify
linkit_extension:
linkit_enabled: true
linkit_profile: default
image_upload:
Expand Down
Loading

0 comments on commit 2bdce62

Please sign in to comment.