Merge branch 'development' of https://github.com/USEPA/IntraCMS into …

…IN-459 � Conflicts: � docroot/themes/custom/epa_intranet/templates/page.html.twig
USEPA · Aug 16, 2021 · d25dfb5 · d25dfb5
2 parents d7853b6 + 6b50355
commit d25dfb5
Show file tree

Hide file tree

Showing 116 changed files with 1,749 additions and 206 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "drupal/views_bulk_operations": "^3.13",
         "drupal/views_add_button": "^1.7",
         "drupal/views_add_button_group": "^2.0",
-        "fontawesome/fontawesome": "5.13.1",
+        "fontawesome/fontawesome": "5.15.4",
         "drupal/twig_field_value": "^2.0",
         "bootstrap/bootstrap": "5.0.2",
         "drupal/easy_breadcrumb": "^1.15",
@@ -43,7 +43,7 @@
         "drupal/bamboo_twig": "^5.0@alpha",
         "drupal/redirect": "^1.5",
         "drupal/webform": "^6.0",
-        "drupal/webform_config_ignore": "^1.1",
+        "drupal/webform_config_ignore": "^1.2",
         "drupal/webform_ui": "^6.0",
         "drupal/webform_node": "^6.0",
         "drupal/webform_access": "^6.0",
@@ -97,7 +97,9 @@
         "drupal/block_list_override": "^1.0",
         "drupal/chosen_lib": "^3.0",
         "drupal/field_permissions": "^1.1",
-        "drupal/block_blacklist": "^1.1"
+        "drupal/block_blacklist": "^1.1",
+        "drupal/oembed_providers": "^1.1",
+        "drupal/entity_clone": "^1.0@beta"
     },
     "require-dev": {
     },
@@ -256,9 +258,9 @@
             "package": {
                 "name": "bootstrap/bootstrap",
                 "type": "drupal-library",
-                "version": "5.0.2",
+                "version": "5.1.0",
                 "dist": {
-                    "url": "https://github.com/twbs/bootstrap/releases/download/v5.0.2/bootstrap-5.0.2-dist.zip",
+                    "url": "https://github.com/twbs/bootstrap/releases/download/v5.1.0/bootstrap-5.1.0-dist.zip",
                     "type": "zip"
                 },
                 "require": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/core.entity_form_display.node.event.default.yml b/config/sync/core.entity_form_display.node.event.default.yml
@@ -6,7 +6,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -25,7 +27,7 @@ third_party_settings:
       children:
         - field_event_recording
       parent_name: ''
-      weight: 14
+      weight: 16
       format_type: details
       region: content
       format_settings:
@@ -58,7 +60,7 @@ content:
     type: smartdate_default
     region: content
   field_event_description:
-    weight: 12
+    weight: 14
     settings:
       rows: 5
       placeholder: ''
@@ -77,17 +79,68 @@ content:
       match_limit: 10
       size: 60
       placeholder: ''
+      dialog_title: ''
     third_party_settings: {  }
     type: entity_reference_tree
     region: content
+  field_event_link:
+    type: link_default
+    weight: 12
+    region: content
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings:
+      conditional_fields:
+        ae9afd15-a22d-4983-b80f-30a1c22ec121:
+          dependee: field_event_location_logistics
+          settings:
+            state: visible
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: online
+            effect: show
+            effect_options: {  }
+            selector: ''
+          entity_type: node
+          bundle: event
   field_event_location:
-    weight: 11
+    weight: 13
     settings:
       size: 60
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      conditional_fields:
+        d8c267ce-104d-4c96-9abc-f7b496c7b58e:
+          dependee: field_event_location_logistics
+          settings:
+            state: visible
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: in-person
+            effect: show
+            effect_options: {  }
+            selector: ''
+          entity_type: node
+          bundle: event
     type: string_textfield
     region: content
+  field_event_location_logistics:
+    weight: 11
+    settings: {  }
+    third_party_settings: {  }
+    type: options_buttons
+    region: content
   field_event_recording:
     weight: 15
     settings:
@@ -97,7 +150,7 @@ content:
     type: link_default
     region: content
   field_event_tags:
-    weight: 13
+    weight: 15
     settings:
       match_operator: CONTAINS
       size: 60
@@ -165,7 +218,7 @@ content:
     region: content
     third_party_settings: {  }
   url_redirects:
-    weight: 15
+    weight: 17
     region: content
     settings: {  }
     third_party_settings: {  }