Skip to content
Snippets Groups Projects
Commit 0bebe848 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.1.x' into prod/1.1.x

parents a4bf3c54 a196c0a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config/install/features.bundle.default.yml
+ 1
− 1
View file @ 0bebe848
langcode: en langcode: en
status: true status: true
dependencies: { } dependencies: { }
machine_name: default
name: Default name: Default
machine_name: default
description: '' description: ''
assignments: assignments:
alter: alter:
......
config/install/views.view.frontpage.yml
+ 220
− 144
View file @ 0bebe848
...@@ -16,7 +16,44 @@ base_table: node_field_data ...@@ -16,7 +16,44 @@ base_table: node_field_data
base_field: nid base_field: nid
display: display:
default: default:
id: default
display_title: Master
display_plugin: default
position: 0
display_options: display_options:
title: ''
fields: { }
pager:
type: full
options:
offset: 0
items_per_page: 10
total_pages: 0
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: Apply
reset_button: false
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
access: access:
type: perm type: perm
options: options:
...@@ -26,28 +63,28 @@ display: ...@@ -26,28 +63,28 @@ display:
options: { } options: { }
empty: empty:
area_text_custom: area_text_custom:
admin_label: '' id: area_text_custom
content: 'No front page content has been created yet.' table: views
empty: true
field: area_text_custom field: area_text_custom
relationship: none
group_type: group group_type: group
id: area_text_custom admin_label: ''
plugin_id: text_custom
label: '' label: ''
relationship: none empty: true
table: views content: 'No front page content has been created yet.'
tokenize: false tokenize: false
plugin_id: text_custom
node_listing_empty: node_listing_empty:
admin_label: ''
empty: true
field: node_listing_empty
group_type: group
id: node_listing_empty id: node_listing_empty
label: ''
relationship: none
table: node table: node
plugin_id: node_listing_empty field: node_listing_empty
relationship: none
group_type: group
admin_label: ''
entity_type: node entity_type: node
plugin_id: node_listing_empty
label: ''
empty: true
title: title:
id: title id: title
table: views table: views
...@@ -55,74 +92,97 @@ display: ...@@ -55,74 +92,97 @@ display:
relationship: none relationship: none
group_type: group group_type: group
admin_label: '' admin_label: ''
plugin_id: title
label: '' label: ''
empty: true empty: true
title: 'Welcome to [site:name]' title: 'Welcome to [site:name]'
plugin_id: title sorts:
exposed_form: sticky:
type: basic id: sticky
options: table: node_field_data
submit_button: Apply field: sticky
reset_button: false relationship: none
reset_button_label: Reset group_type: group
exposed_sorts_label: 'Sort by' admin_label: ''
expose_sort_order: true entity_type: node
sort_asc_label: Asc entity_field: sticky
sort_desc_label: Desc plugin_id: boolean
order: DESC
expose:
label: ''
field_identifier: sticky
exposed: false
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: filters:
promote: promote:
id: promote
table: node_field_data
field: promote
relationship: none
group_type: group
admin_label: '' admin_label: ''
entity_type: node
entity_field: promote
plugin_id: boolean
operator: '='
value: '1'
group: 1
exposed: false
expose: expose:
description: '' operator_id: ''
identifier: ''
label: '' label: ''
multiple: false description: ''
use_operator: false
operator: '' operator: ''
operator_id: '' operator_limit_selection: false
operator_list: { }
identifier: ''
required: false
remember: false remember: false
multiple: false
remember_roles: remember_roles:
authenticated: authenticated authenticated: authenticated
required: false is_grouped: false
use_operator: false
operator_limit_selection: false
operator_list: { }
exposed: false
field: promote
group: 1
group_info: group_info:
default_group: All label: ''
default_group_multiple: { }
description: '' description: ''
group_items: { }
identifier: '' identifier: ''
label: ''
multiple: false
optional: true optional: true
remember: false
widget: select widget: select
group_type: group multiple: false
id: promote remember: false
is_grouped: false default_group: All
operator: '=' default_group_multiple: { }
relationship: none group_items: { }
status:
id: status
table: node_field_data table: node_field_data
value: '1' field: status
plugin_id: boolean
entity_type: node entity_type: node
entity_field: promote entity_field: status
status: plugin_id: boolean
value: '1'
group: 1
expose: expose:
operator: '' operator: ''
operator_limit_selection: false operator_limit_selection: false
operator_list: { } operator_list: { }
field: status
group: 1
id: status
table: node_field_data
value: '1'
plugin_id: boolean
entity_type: node
entity_field: status
langcode: langcode:
id: langcode id: langcode
table: node_field_data table: node_field_data
...@@ -130,6 +190,9 @@ display: ...@@ -130,6 +190,9 @@ display:
relationship: none relationship: none
group_type: group group_type: group
admin_label: '' admin_label: ''
entity_type: node
entity_field: langcode
plugin_id: language
operator: in operator: in
value: value:
'***LANGUAGE_language_content***': '***LANGUAGE_language_content***' '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
...@@ -141,6 +204,8 @@ display: ...@@ -141,6 +204,8 @@ display:
description: '' description: ''
use_operator: false use_operator: false
operator: '' operator: ''
operator_limit_selection: false
operator_list: { }
identifier: '' identifier: ''
required: false required: false
remember: false remember: false
...@@ -148,8 +213,6 @@ display: ...@@ -148,8 +213,6 @@ display:
remember_roles: remember_roles:
authenticated: authenticated authenticated: authenticated
reduce: false reduce: false
operator_limit_selection: false
operator_list: { }
is_grouped: false is_grouped: false
group_info: group_info:
label: '' label: ''
...@@ -162,74 +225,82 @@ display: ...@@ -162,74 +225,82 @@ display:
default_group: All default_group: All
default_group_multiple: { } default_group_multiple: { }
group_items: { } group_items: { }
plugin_id: language field_uw_exclude_auto_value:
entity_type: node id: field_uw_exclude_auto_value
entity_field: langcode table: node__field_uw_exclude_auto
pager: field: field_uw_exclude_auto_value
type: full relationship: none
options: group_type: group
items_per_page: 10
offset: 0
id: 0
total_pages: 0
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
tags:
previous: '‹ Previous'
next: 'Next ›'
first: '« First'
last: 'Last »'
quantity: 9
query:
type: views_query
options:
disable_sql_rewrite: false
distinct: false
replica: false
query_comment: ''
query_tags: { }
row:
type: 'entity:node'
options:
view_mode: teaser
sorts:
sticky:
admin_label: '' admin_label: ''
plugin_id: boolean
operator: '='
value: '0'
group: 1
exposed: false
expose: expose:
operator_id: ''
label: '' label: ''
field_identifier: sticky description: ''
exposed: false use_operator: false
field: sticky operator: ''
group_type: group operator_limit_selection: false
id: sticky operator_list: { }
order: DESC identifier: ''
relationship: none required: false
table: node_field_data remember: false
plugin_id: boolean multiple: false
entity_type: node remember_roles:
entity_field: sticky authenticated: authenticated
created: is_grouped: false
field: created group_info:
id: created label: ''
order: DESC description: ''
table: node_field_data identifier: ''
plugin_id: date optional: true
widget: select
multiple: false
remember: false
default_group: All
default_group_multiple: { }
group_items: { }
field_uw_exclude_auto_value_1:
id: field_uw_exclude_auto_value_1
table: node__field_uw_exclude_auto
field: field_uw_exclude_auto_value
relationship: none relationship: none
group_type: group group_type: group
admin_label: '' admin_label: ''
plugin_id: boolean
operator: '='
value: '0'
group: 1
exposed: false exposed: false
expose: expose:
operator_id: ''
label: '' label: ''
field_identifier: created description: ''
granularity: second use_operator: false
entity_type: node operator: ''
entity_field: created operator_limit_selection: false
operator_list: { }
identifier: ''
required: false
remember: false
multiple: false
remember_roles:
authenticated: authenticated
is_grouped: false
group_info:
label: ''
description: ''
identifier: ''
optional: true
widget: select
multiple: false
remember: false
default_group: All
default_group_multiple: { }
group_items: { }
style: style:
type: default type: default
options: options:
...@@ -237,74 +308,79 @@ display: ...@@ -237,74 +308,79 @@ display:
row_class: '' row_class: ''
default_row_class: true default_row_class: true
uses_fields: false uses_fields: false
title: '' row:
type: 'entity:node'
options:
view_mode: teaser
query:
type: views_query
options:
query_comment: ''
disable_sql_rewrite: false
distinct: false
replica: false
query_tags: { }
relationships: { }
header: { } header: { }
footer: { } footer: { }
relationships: { }
fields: { }
arguments: { }
display_extenders: { } display_extenders: { }
display_plugin: default
display_title: Master
id: default
position: 0
cache_metadata: cache_metadata:
max-age: -1
contexts: contexts:
- 'languages:language_interface' - 'languages:language_interface'
- url.query_args - url.query_args
- 'user.node_grants:view' - 'user.node_grants:view'
- user.permissions - user.permissions
max-age: -1
tags: { } tags: { }
feed_1: feed_1:
display_plugin: feed
id: feed_1 id: feed_1
display_title: Feed display_title: Feed
display_plugin: feed
position: 2 position: 2
display_options: display_options:
sitename_title: true
path: rss.xml
displays:
page_1: page_1
default: ''
pager: pager:
type: some type: some
options: options:
items_per_page: 10
offset: 0 offset: 0
items_per_page: 10
style: style:
type: rss type: rss
options: options:
description: ''
grouping: { } grouping: { }
uses_fields: false uses_fields: false
description: ''
row: row:
type: node_rss type: node_rss
options: options:
relationship: none relationship: none
view_mode: rss view_mode: rss
display_extenders: { } display_extenders: { }
path: rss.xml
sitename_title: true
displays:
page_1: page_1
default: ''
cache_metadata: cache_metadata:
max-age: -1
contexts: contexts:
- 'languages:language_interface' - 'languages:language_interface'
- 'user.node_grants:view' - 'user.node_grants:view'
- user.permissions - user.permissions
max-age: -1
tags: { } tags: { }
page_1: page_1:
id: page_1
display_title: Page
display_plugin: page
position: 1
display_options: display_options:
path: node
display_extenders: display_extenders:
metatag_display_extender: { } metatag_display_extender: { }
display_plugin: page path: node
display_title: Page
id: page_1
position: 1
cache_metadata: cache_metadata:
max-age: -1
contexts: contexts:
- 'languages:language_interface' - 'languages:language_interface'
- url.query_args - url.query_args
- 'user.node_grants:view' - 'user.node_grants:view'
- user.permissions - user.permissions
max-age: -1
tags: { } tags: { }
uw_sites_all.info.yml
+ 6
− 0
View file @ 0bebe848
...@@ -28,6 +28,8 @@ dependencies: ...@@ -28,6 +28,8 @@ dependencies:
- 'drupal:block_content' - 'drupal:block_content'
- 'drupal:block_form_alter' - 'drupal:block_form_alter'
- 'drupal:breakpoint' - 'drupal:breakpoint'
- 'drupal:calendar_view'
- 'drupal:calendar_view_multiday'
- 'drupal:ckeditor' - 'drupal:ckeditor'
- 'drupal:comment' - 'drupal:comment'
- 'drupal:config' - 'drupal:config'
...@@ -74,6 +76,7 @@ dependencies: ...@@ -74,6 +76,7 @@ dependencies:
- 'drupal:user' - 'drupal:user'
- 'drupal:views' - 'drupal:views'
- 'drupal:workflows' - 'drupal:workflows'
- 'calculation_fields:calculation_fields'
- 'editoria11y:editoria11y' - 'editoria11y:editoria11y'
- 'entity_reference_revisions:entity_reference_revisions' - 'entity_reference_revisions:entity_reference_revisions'
- 'eu_cookie_compliance:eu_cookie_compliance' - 'eu_cookie_compliance:eu_cookie_compliance'
...@@ -109,6 +112,7 @@ dependencies: ...@@ -109,6 +112,7 @@ dependencies:
- 'metatag:metatag_twitter_cards' - 'metatag:metatag_twitter_cards'
- 'metatag:metatag_views' - 'metatag:metatag_views'
- 'module_filter:module_filter' - 'module_filter:module_filter'
- 'multivalue_form_element:multivalue_form_element'
- 'node_revision_delete:node_revision_delete' - 'node_revision_delete:node_revision_delete'
- 'office_hours:office_hours' - 'office_hours:office_hours'
- 'override_node_options:override_node_options' - 'override_node_options:override_node_options'
...@@ -192,6 +196,8 @@ dependencies: ...@@ -192,6 +196,8 @@ dependencies:
- 'webform:webform_options_limit' - 'webform:webform_options_limit'
- 'webform:webform_ui' - 'webform:webform_ui'
- 'webform_mailchimp:webform_mailchimp' - 'webform_mailchimp:webform_mailchimp'
- 'webform_calculation_fields:webform_calculation_fields'
- 'webform_remote_fields:webform_remote_fields'
- 'webform_xlsx_export:webform_xlsx_export' - 'webform_xlsx_export:webform_xlsx_export'
- 'workbench_access:workbench_access' - 'workbench_access:workbench_access'
libraries: libraries:
......
uw_sites_all.install
+ 29
− 0
View file @ 0bebe848
...@@ -1693,6 +1693,7 @@ function uw_sites_all_update_9142(&$sandbox) { ...@@ -1693,6 +1693,7 @@ function uw_sites_all_update_9142(&$sandbox) {
* Install views_cm_current_state. * Install views_cm_current_state.
*/ */
function uw_sites_all_update_9143(&$sandbox) { function uw_sites_all_update_9143(&$sandbox) {
$modules = [ $modules = [
'views_cm_current_state', 'views_cm_current_state',
]; ];
...@@ -1773,3 +1774,31 @@ function uw_sites_all_update_9149(&$sandbox) { ...@@ -1773,3 +1774,31 @@ function uw_sites_all_update_9149(&$sandbox) {
\Drupal::service('module_installer')->install($modules); \Drupal::service('module_installer')->install($modules);
} }
/**
* Install calendar view modules.
*/
function uw_sites_all_update_9150(&$sandbox) {
// Calendar modules to install.
$modules = [
'calendar_view',
'calendar_view_multiday',
];
// Install the calendar modules.
\Drupal::service('module_installer')->install($modules);
}
/**
* Install calculation_fields, multivalue_form_element, webform_remote_fields.
*/
function uw_sites_all_update_9151(&$sandbox) {
$modules = [
'calculation_fields',
'multivalue_form_element',
'webform_calculation_fields',
'webform_remote_fields',
];
\Drupal::service('module_installer')->install($modules);
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment