Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10.1.2 #1445

Merged
merged 5 commits into from
Feb 6, 2024
Merged

10.1.2 #1445

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions blt/blt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ multisites:
- lowe
- mathematics
- mathematics2023
- mathematics2024
- mcs
- mcs2023
- mediterraneanstudies
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"drupal/cshs": "^4.0",
"drupal/default_content": "^2.0",
"drupal/diff": "^1.0",
"drupal/display_field_copy": "^2.1",
"drupal/domain_301_redirect": "^2.0",
"drupal/domain_registration": "^1.6",
"drupal/draggableviews": "^2.0",
Expand Down
51 changes: 50 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ third_party_settings:
date:
- field_hs_event_date
time:
- 'dynamic_block_field:node-hs_event_time_range'
- 'display_field_copy:node-hs_event_time_range'
location:
- field_hs_event_location
category:
Expand All @@ -73,11 +73,23 @@ third_party_settings:
link: true
wrapper: span
class: ''
'dynamic_block_field:node-hs_event_time_range':
plugin_id: 'dynamic_block_field:node-hs_event_time_range'
'display_field_copy:node-hs_event_time_range':
plugin_id: 'display_field_copy:node-hs_event_time_range'
weight: 3
label: hidden
formatter: default
formatter: smartdate_custom
settings:
formatter:
separator: ' - '
date_format: 'g:i A'
custom_date_format: ''
timezone: ''
join: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
id: node.hs_event.hs_horizontal_card
targetEntityType: node
bundle: hs_event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ third_party_settings:
month:
- field_hs_event_date
day:
- 'dynamic_block_field:node-hs_event_day'
- 'display_field_copy:node-hs_event_day'
time:
- 'dynamic_block_field:node-hs_event_time'
- 'display_field_copy:node-hs_event_time'
location:
- field_hs_event_location
title:
Expand All @@ -71,16 +71,36 @@ third_party_settings:
link: true
wrapper: span
class: ''
'dynamic_block_field:node-hs_event_day':
plugin_id: 'dynamic_block_field:node-hs_event_day'
'display_field_copy:node-hs_event_day':
plugin_id: 'display_field_copy:node-hs_event_day'
weight: 2
label: hidden
formatter: default
'dynamic_block_field:node-hs_event_time':
plugin_id: 'dynamic_block_field:node-hs_event_time'
formatter: smartdatetime_hs
settings:
formatter:
date_format: j
custom_date_format: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
display: start
'display_field_copy:node-hs_event_time':
plugin_id: 'display_field_copy:node-hs_event_time'
weight: 3
label: hidden
formatter: default
formatter: smartdatetime_hs
settings:
formatter:
date_format: 'g:i A'
custom_date_format: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
display: start
_core:
default_config_hash: Pg8viXyep1xkahAJ1PuLkHohrDbm4d4QxZBJIrb32-g
id: node.hs_event.hs_vertical_card
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ third_party_settings:
date:
- field_hs_event_date
time:
- 'dynamic_block_field:node-hs_event_time'
- 'display_field_copy:node-hs_event_time'
location:
- field_hs_event_location
category:
Expand All @@ -77,11 +77,21 @@ third_party_settings:
weight: 0
label: hidden
formatter: default
'dynamic_block_field:node-hs_event_time':
plugin_id: 'dynamic_block_field:node-hs_event_time'
'display_field_copy:node-hs_event_time':
plugin_id: 'display_field_copy:node-hs_event_time'
weight: 3
label: hidden
formatter: default
formatter: smartdatetime_hs
settings:
formatter:
date_format: 'g:i A'
custom_date_format: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
display: start
_core:
default_config_hash: Pg8viXyep1xkahAJ1PuLkHohrDbm4d4QxZBJIrb32-g
id: node.hs_event.search_result
Expand Down
2 changes: 2 additions & 0 deletions config/default/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ module:
datetime_range: 0
default_content: 0
diff: 0
display_field_copy: 0
domain_301_redirect: 0
domain_registration: 0
draggableviews: 0
Expand Down Expand Up @@ -262,6 +263,7 @@ module:
pathauto: 1
selective_better_exposed_filters: 1
xmlsitemap: 1
ds_extras: 2
externalauth: 10
hs_field_helpers: 10
menu_link_weight: 10
Expand Down
32 changes: 3 additions & 29 deletions config/default/ds.field.hs_event_day.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,9 @@
id: hs_event_day
label: 'Event Start Day'
ui_limit: 'hs_event|*'
type: block
type_label: 'Block field'
type: display_field_copy
type_label: 'Copy field'
entities:
node: node
properties:
block: 'field_block:node:hs_event:field_hs_event_date'
use_block_title: false
add_block_wrappers: false
config:
id: 'field_block:node:hs_event:field_hs_event_date'
label: ''
label_display: ''
provider: layout_builder
context_mapping:
entity: '@node.node_route_context:node'
formatter:
type: smartdatetime_hs
label: hidden
settings:
date_format: j
custom_date_format: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
display: start
third_party_settings:
field_formatter_class:
class: ''
hs_field_helpers:
inline_contents: 0
field_id: node.hs_event.field_hs_event_date
32 changes: 3 additions & 29 deletions config/default/ds.field.hs_event_time.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,9 @@
id: hs_event_time
label: 'Event Start Time'
ui_limit: 'hs_event|*'
type: block
type_label: 'Block field'
type: display_field_copy
type_label: 'Copy field'
entities:
node: node
properties:
block: 'field_block:node:hs_event:field_hs_event_date'
use_block_title: false
add_block_wrappers: false
config:
id: 'field_block:node:hs_event:field_hs_event_date'
label: ''
label_display: ''
provider: layout_builder
context_mapping:
entity: '@node.node_route_context:node'
formatter:
type: smartdatetime_hs
label: hidden
settings:
date_format: 'g:i A'
custom_date_format: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
display: start
third_party_settings:
field_formatter_class:
class: ''
hs_field_helpers:
inline_contents: 0
field_id: node.hs_event.field_hs_event_date
34 changes: 3 additions & 31 deletions config/default/ds.field.hs_event_time_range.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,9 @@
id: hs_event_time_range
label: 'Event Time Range'
ui_limit: 'hs_event|*'
type: block
type_label: 'Block field'
type: display_field_copy
type_label: 'Copy field'
entities:
node: node
properties:
block: 'field_block:node:hs_event:field_hs_event_date'
use_block_title: false
add_block_wrappers: false
config:
id: 'field_block:node:hs_event:field_hs_event_date'
label: ''
label_display: ''
provider: layout_builder
context_mapping:
entity: '@node.node_route_context:node'
formatter:
type: smartdate_custom
label: hidden
settings:
separator: ' - '
date_format: 'g:i A'
custom_date_format: ''
timezone: ''
join: ''
time_format: ''
time_hour_format: ''
allday_label: 'All day'
date_first: '1'
ampm_reduce: 0
third_party_settings:
field_formatter_class:
class: ''
hs_field_helpers:
inline_contents: 0
field_id: node.hs_event.field_hs_event_date
14 changes: 7 additions & 7 deletions config/default/ds.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ _core:
default_config_hash: xfB0qOeoAomOThclNNokdKTrVwXLcXz13SU3-4a5-FY
disabled: false
field_template: false
ft_default: default
ft_show_colon: false
ft_layout_builder: false
ft_bc: false
ft_default_bc: false
ft_expert_prefix_suffix_textarea: false
classes:
region: { }
field: { }
use_field_names: true
ft_bc: true
exclude_layout_builder_blocks_on_block_field: false
ft_expert_prefix_suffix_textarea: false
ft_default: default
ft_show_colon: false
ft_layout_builder: null
exclude_layout_builder_blocks_on_block_field: true
exclude_ds_layout_layout_builder: false
layout_icon_image_bc: true
ft_default_bc: true
layout_suggestion_bc: true
12 changes: 12 additions & 0 deletions config/default/ds_extras.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
_core:
default_config_hash: 8pAfQieshWvLj1iz2mD2Ydynqhjim6jFKtet9mXaMKI
region_blocks: { }
fields_extra: false
fields_extra_list: { }
field_permissions: false
switch_field: false
switch_field_prefix: node--view-mode-
hidden_region: false
region_to_block: false
override_node_revision: false
override_node_revision_view_mode: full

Large diffs are not rendered by default.

Loading
Loading