Commit 8b5e80f9 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 45fa62f1 0ef1e6ce
......@@ -13,25 +13,17 @@
"require": {
"commerceguys/addressing": "1.0.8",
"composer/installers": "^1.7",
"cweagans/composer-patches": "^1.7",
"drupal/address": "1.9",
"drupal/admin_toolbar": "2.4",
"drupal/admin_toolbar": "2.5",
"drupal/allowed_formats": "1.3",
"drupal/autocomplete_deluxe": "2.0.0",
"drupal/better_exposed_filters": "5.0-beta3",
"drupal/block_list_override": "1.0.1",
"drupal/cancel_button": "1.1",
"drupal/captcha": "1.1",
"drupal/cancel_button": "dev-1.2-uw_wcms1",
"drupal/captcha": "1.2",
"drupal/ckeditorheight": "1.5",
"drupal/components": "2.0-beta3",
"drupal/conditional_fields": "dev-8.x-1.0-alpha10+1-dev-uw_wcms1",
"drupal/config_distro": "1.0-alpha4",
"drupal/config_filter": "2.1",
"drupal/config_merge": "1.0-rc3",
"drupal/config_normalizer": "1.0-alpha6",
"drupal/config_provider": "2.0-rc4",
"drupal/config_snapshot": "1.0-rc2",
"drupal/config_sync": "2.0-beta7",
"drupal/components": "2.4",
"drupal/conditional_fields": "4.0.0-alpha1",
"drupal/config_update": "1.7",
"drupal/config_views": "dev-2.0.0-beta1-uw_wcms1",
"drupal/crop": "2.1",
......@@ -39,43 +31,43 @@
"drupal/dashboards": "dev-2.0.0-beta12-uw_wcms1",
"drupal/draggableviews": "2.0.1",
"drupal/diff": "1.0",
"drupal/entity_browser": "2.5",
"drupal/entity_browser": "2.6",
"drupal/entity_browser_block": "1.1",
"drupal/entity_browser_block_layout": "dev-8.x-1.x",
"drupal/entity_class_formatter": "1.2",
"drupal/entity_reference_revisions": "1.8",
"drupal/entity_reference_revisions": "1.9",
"drupal/eu_cookie_compliance": "1.14",
"drupal/externalauth": "^1.3",
"drupal/features": "3.11",
"drupal/features": "3.12",
"drupal/fences": "2.0-rc1",
"drupal/field_group": "3.2",
"drupal/field_validation": "1.0-beta3",
"drupal/file_mdm": "2.1",
"drupal/filefield_sources": "dev-8.x-1.0-alpha4+3-dev",
"drupal/geofield": "1.15",
"drupal/geofield_map": "2.67",
"drupal/geofield": "1.34",
"drupal/geofield_map": "2.70",
"drupal/hcaptcha": "1.1",
"drupal/honeypot": "1.30",
"drupal/hook_event_dispatcher": "2.04",
"drupal/hook_event_dispatcher": "2.05",
"drupal/image_widget_crop": "dev-8.x-2.3+1-dev",
"drupal/imageapi_optimize": "2.0-beta1",
"drupal/imageapi_optimize_binaries": "1.0-alpha2",
"drupal/imageapi_optimize_resmushit": "1.0-beta1",
"drupal/imagemagick": "3.1",
"drupal/imagemagick": "3.2",
"drupal/imce": "2.3",
"drupal/inline_entity_form": "1.0-rc7",
"drupal/inline_entity_form": "1.0-rc9",
"drupal/jquery_ui": "1.4",
"drupal/jquery_ui_datepicker": "1.0",
"drupal/jquery_ui_datepicker": "1.1",
"drupal/jquery_ui_slider": "1.1",
"drupal/jquery_ui_touch_punch": "1.0.0",
"drupal/label_help": "dev-8.x-1.x",
"drupal/layout_builder_browser": "dev-1.2-uw_wcms2",
"drupal/layout_builder_ids": "2.0.0-rc6",
"drupal/layout_builder_lock": "1.0-rc7",
"drupal/layout_builder_lock": "1.1",
"drupal/layout_builder_modal": "1.1",
"drupal/layout_builder_restrictions": "2.9",
"drupal/layout_builder_styles": "1.0-beta2",
"drupal/leaflet": "2.1.2",
"drupal/layout_builder_styles": "1.0-beta4",
"drupal/leaflet": "2.1.14",
"drupal/libraries": "3.0-beta1",
"drupal/linkit": "dev-6.0.0-beta1-uw_wcms2",
"drupal/mailsystem": "4.3",
......@@ -96,25 +88,25 @@
"drupal/readmehelp": "1.0-beta4",
"drupal/realname": "1.0-rc2",
"drupal/redirect": "dev-1.6-uw_wcms1",
"drupal/require_on_publish": "1.2",
"drupal/require_on_publish": "1.6",
"drupal/restui": "^1.17",
"drupal/role_expire": "dev-2.0.0+3-dev",
"drupal/role_expire": "2.0.1",
"drupal/roleassign": "1.0-beta1",
"drupal/schema_metatag": "1.8",
"drupal/sendgrid_integration": "2.0-alpha4",
"drupal/sendgrid_integration": "2.0-beta2",
"drupal/simplesamlphp_auth": "dev-3.2-uw_wcms1",
"drupal/simplesamlphp_custom_attributes": "dev-8.x-1.1+5-dev",
"drupal/simplify_menu": "2.0",
"drupal/smart_date": "3.1.1",
"drupal/sophron": "1.0",
"drupal/simplify_menu": "2.1",
"drupal/smart_date": "3.4.2",
"drupal/sophron": "1.1",
"drupal/structure_sync": "2.0.1",
"drupal/subpathauto": "dev-1.1-uw_wcms1",
"drupal/term_reference_tree": "1.0",
"drupal/token": "1.7",
"drupal/token": "1.9",
"drupal/transliterate_filenames": "1.5",
"drupal/tvi": "1.0-beta1",
"drupal/tvi": "1.0-rc4",
"drupal/twig_field_value": "1.2",
"drupal/twig_tweak": "2.8",
"drupal/twig_tweak": "2.9",
"drupal/userprotect": "dev-1.1-uw_wcms2",
"drupal/video_embed_field": "2.2",
"drupal/views_autocomplete_filters": "1.3",
......@@ -122,15 +114,15 @@
"drupal/views_contextual_filters_or": "1.2",
"drupal/views_exposed_filter_blocks": "1.1",
"drupal/views_taxonomy_term_name_into_id": "dev-1.0-alpha3-uw_wcms1",
"drupal/webform": "5.25",
"drupal/webform": "5.28",
"drupal/workbench_access": "1.0-beta4",
"fastglass/sendgrid": ">=2.0.0",
"fileeye/mimemap": "^1.1",
"libraries/ckeditor-clipboard": "4.15.1",
"libraries/ckeditor-dialog": "4.15.1",
"libraries/ckeditor-lineutils": "4.15.1",
"libraries/ckeditor-mathjax": "4.15.1",
"libraries/ckeditor-widget": "4.15.1",
"libraries/ckeditor-clipboard": "4.16.2",
"libraries/ckeditor-dialog": "4.16.2",
"libraries/ckeditor-lineutils": "4.16.2",
"libraries/ckeditor-mathjax": "4.16.2",
"libraries/ckeditor-widget": "4.16.2",
"libraries/drupal-composer-info-rewrite": "1.0.0",
"libraries/jquery-ui-touch-punch": "dev-master",
"onelogin/php-saml": "3.2.1",
......
......@@ -38,6 +38,7 @@
"ckeditor/link": "*",
"codemirror/codemirror": "*",
"jquery/chosen": "*",
"jquery/geocomplete": "*",
"jquery/hotkeys": "*",
"jquery/icheck": "*",
"jquery/image-picker": "*",
......@@ -49,7 +50,8 @@
"jquery/timepicker": "*",
"jquery/toggles": "*",
"progress-tracker/progress-tracker": "*",
"signature_pad/signature_pad": "*"
"signature_pad/signature_pad": "*",
"svg-pan-zoom/svg-pan-zoom": "*"
},
"repositories": {
"algolia.places": {
......@@ -88,7 +90,7 @@
"type": "package",
"package": {
"name": "ckeditor/autogrow",
"version": "4.14.1",
"version": "4.16.2",
"type": "drupal-library",
"extra": {
"installer-name": "ckeditor.autogrow"
......@@ -96,7 +98,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/ckeditor-autogrow.git",
"type": "git",
"reference": "4.14.1"
"reference": "4.16.2"
}
}
},
......@@ -120,7 +122,7 @@
"type": "package",
"package": {
"name": "ckeditor/fakeobjects",
"version": "4.14.1",
"version": "4.16.2",
"type": "drupal-library",
"extra": {
"installer-name": "ckeditor.fakeobjects"
......@@ -128,7 +130,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/ckeditor-fakeobjects.git",
"type": "git",
"reference": "4.14.1"
"reference": "4.16.2"
}
}
},
......@@ -136,7 +138,7 @@
"type": "package",
"package": {
"name": "ckeditor/image",
"version": "4.14.1",
"version": "4.16.2",
"type": "drupal-library",
"extra": {
"installer-name": "ckeditor.image"
......@@ -144,7 +146,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/ckeditor-image.git",
"type": "git",
"reference": "4.14.1"
"reference": "4.16.2"
}
}
},
......@@ -152,7 +154,7 @@
"type": "package",
"package": {
"name": "ckeditor/link",
"version": "4.14.1",
"version": "4.16.2",
"type": "drupal-library",
"extra": {
"installer-name": "ckeditor.link"
......@@ -160,7 +162,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/ckeditor-link.git",
"type": "git",
"reference": "4.14.1"
"reference": "4.16.2"
}
}
},
......@@ -168,7 +170,7 @@
"type": "package",
"package": {
"name": "codemirror/codemirror",
"version": "5.57.0",
"version": "5.61.1",
"type": "drupal-library",
"extra": {
"installer-name": "codemirror"
......@@ -176,7 +178,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/codemirror.git",
"type": "git",
"reference": "5.57.0"
"reference": "5.61.1"
}
}
},
......@@ -196,6 +198,22 @@
}
}
},
"jquery.geocomplete": {
"type": "package",
"package": {
"name": "jquery/geocomplete",
"version": "1.7.0",
"type": "drupal-library",
"extra": {
"installer-name": "jquery.geocomplete"
},
"source": {
"url": "https://git.uwaterloo.ca/libraries/jquery-geocomplete.git",
"type": "git",
"reference": "1.7.0"
}
}
},
"jquery.hotkeys": {
"type": "package",
"package": {
......@@ -248,7 +266,7 @@
"type": "package",
"package": {
"name": "jquery/inputmask",
"version": "5.0.5",
"version": "5.0.6",
"type": "drupal-library",
"extra": {
"installer-name": "jquery.inputmask"
......@@ -256,7 +274,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/jquery-inputmask.git",
"type": "git",
"reference": "5.0.5"
"reference": "5.0.6"
}
}
},
......@@ -328,7 +346,7 @@
"type": "package",
"package": {
"name": "jquery/timepicker",
"version": "1.13.14",
"version": "1.13.18",
"type": "drupal-library",
"extra": {
"installer-name": "jquery.timepicker"
......@@ -336,7 +354,7 @@
"source": {
"url": "https://git.uwaterloo.ca/libraries/jquery-timepicker.git",
"type": "git",
"reference": "1.13.14"
"reference": "1.13.18"
}
}
},
......@@ -387,6 +405,22 @@
"reference": "v2.3.0"
}
}
},
"svg-pan-zoom": {
"type": "package",
"package": {
"name": "svg-pan-zoom/svg-pan-zoom",
"version": "3.6.1",
"type": "drupal-library",
"extra": {
"installer-name": "svg-pan-zoom"
},
"source": {
"url": "https://git.uwaterloo.ca/libraries/svg-pan-zoom.git",
"type": "git",
"reference": "3.6.1"
}
}
}
}
}
diff --git a/core/misc/dialog/off-canvas.reset.css b/core/misc/dialog/off-canvas.reset.css
index 6c16f3ddd6..b2c0e68592 100644
--- a/core/misc/dialog/off-canvas.reset.css
+++ b/core/misc/dialog/off-canvas.reset.css
@@ -5,21 +5,6 @@
* This is a generic reset. Drupal-specific classes are reset in components.
*/
-/**
- * Do not include div in then initial overrides because including div will
- * cause the need for many more overrides in this file.
- */
-#drupal-off-canvas *:not(div),
-#drupal-off-canvas *:not(svg *),
-#drupal-off-canvas *:after,
-#drupal-off-canvas *:before {
- all: initial;
- box-sizing: border-box;
- text-shadow: none;
- -webkit-font-smoothing: antialiased;
- -webkit-tap-highlight-color: initial;
-}
-
/* Reset size and position on elements. */
#drupal-off-canvas a,
#drupal-off-canvas abbr,
diff --git a/core/themes/stable/css/core/dialog/off-canvas.reset.css b/core/themes/stable/css/core/dialog/off-canvas.reset.css
index 6c16f3ddd6..b2c0e68592 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.reset.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.reset.css
@@ -5,21 +5,6 @@
* This is a generic reset. Drupal-specific classes are reset in components.
*/
-/**
- * Do not include div in then initial overrides because including div will
- * cause the need for many more overrides in this file.
- */
-#drupal-off-canvas *:not(div),
-#drupal-off-canvas *:not(svg *),
-#drupal-off-canvas *:after,
-#drupal-off-canvas *:before {
- all: initial;
- box-sizing: border-box;
- text-shadow: none;
- -webkit-font-smoothing: antialiased;
- -webkit-tap-highlight-color: initial;
-}
-
/* Reset size and position on elements. */
#drupal-off-canvas a,
#drupal-off-canvas abbr,
......@@ -645,6 +645,10 @@ class UwWcmsBasicTest extends BrowserTestBase {
}
}
$this->drupalGet('node/add/uw_ct_site_footer');
$match = preg_match(',site-footer/[^/]+/edit$,', $this->getSession()->getCurrentUrl());
$this->assert($match, 'Node add page for site footer redirects to edit page when a footer already exists.');
// Test uw_ct_sidebar. There is no title in the content type, only a node
// reference field.
$edit = [
......@@ -682,6 +686,11 @@ class UwWcmsBasicTest extends BrowserTestBase {
$match = preg_match(',/admin/uw-content-moderation/\d+/\d+/\d+$,', $url);
$this->assert($match, 'Moderation form URL is in the expected format.');
// Load home page edit page.
$this->drupalGet('home/edit');
// Test default front page title metatag.
$this->assertSession()->fieldValueEquals('edit-field-uw-meta-tags-0-basic-title', 'Home | [site:name]');
// Test home page protection.
//
// Login as Site Manager. Test that various controls are available, then
......@@ -1092,6 +1101,7 @@ class UwWcmsBasicTest extends BrowserTestBase {
'Image gallery',
'Instagram',
'Mailman subscription',
'Multi-type list',
'PowerBI',
'Related links',
'Remote video',
......@@ -1171,6 +1181,11 @@ class UwWcmsBasicTest extends BrowserTestBase {
$this->assertFieldByXPath('//div[@class="uw-google-maps"]/iframe[@height="' . $edit['edit-settings-block-form-field-gmaps-height-0-value'] . '" and @src="' . $edit['edit-settings-block-form-field-gmaps-embedded-url-0-uri'] . '"]');
break;
case 'Multi-type list':
$this->assertField('edit-settings-show-all-items');
$this->assertField('edit-settings-show-view-all');
break;
case 'PowerBI':
// Create PowerBI block.
$edit = [
......
Supports Markdown
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