Merge pull request #118 from USEPA/IN-192

In 192

composer.json

@@ -88,7 +88,8 @@
         "pear/archive_tar": "1.4.13",
         "drupal/jira_issue_collector": "1.1.0",
         "drupal/node_export": "^1.0@alpha",
-        "drupal/variationcache": "^1.0"
+        "drupal/variationcache": "^1.0",
+        "drupal/addtocal": "^2.0@beta"
     },
     "require-dev": {
         "drush/drush": "^9.0"
@@ -98,6 +99,12 @@
     },
     "extra": {
         "patches": {
+          "spatie/calendar-links": {
+            "Fix ICS HTML formatting": "patches/spatie_ics_html_format.patch"
+          },
+            "drupal/addtocal": {
+                "1551026: Allow compatibility with smart date": "https://www.drupal.org/files/issues/2021-02-26/1551026-smart_date.patch"
+            },
             "drupal/diff": {
                 "2980335: Establish class attribute as array instead of string.": "https://www.drupal.org/files/issues/2018-06-18/2980335_2_define_classes_as_array.patch"
             },

config/sync/core.entity_form_display.node.event.default.yml

@@ -50,6 +50,9 @@ content:
     weight: 8
     settings:
       modal: false
+      default_duration: 60
+      default_duration_increments: "30\n60|1 hour\n90\n120|2 hours\ncustom"
+      show_extra: true
     third_party_settings: {  }
     type: smartdate_default
     region: content

config/sync/core.entity_view_display.node.event.default.yml

@@ -29,27 +29,7 @@ third_party_settings:
         layout_id: layout_onecol
         layout_settings:
           label: ''
-        components:
-          d85c9582-7126-4288-a154-3981c572676f:
-            uuid: d85c9582-7126-4288-a154-3981c572676f
-            region: content
-            configuration:
-              id: 'field_block:node:event:field_event_date'
-              label: 'Event Date'
-              provider: layout_builder
-              label_display: '0'
-              formatter:
-                label: above
-                type: smartdate_default
-                settings:
-                  timezone_override: ''
-                  format: default
-                third_party_settings: {  }
-              context_mapping:
-                entity: layout_builder.entity
-            additional:
-              layout_builder_styles_style: ''
-            weight: 0
+        components: {  }
         third_party_settings: {  }
       -
         layout_id: layout_twocol_section
@@ -73,7 +53,7 @@ third_party_settings:
               context_mapping:
                 entity: layout_builder.entity
             additional: {  }
-            weight: 0
+            weight: 2
           2649052a-3c2d-4d5e-bab2-6f4cab35bea9:
             uuid: 2649052a-3c2d-4d5e-bab2-6f4cab35bea9
             region: second
@@ -110,6 +90,56 @@ third_party_settings:
                 entity: layout_builder.entity
             additional: {  }
             weight: 1
+          d85c9582-7126-4288-a154-3981c572676f:
+            uuid: d85c9582-7126-4288-a154-3981c572676f
+            region: first
+            configuration:
+              id: 'field_block:node:event:field_event_date'
+              label: 'Event Date'
+              provider: layout_builder
+              label_display: '0'
+              formatter:
+                label: above
+                type: addtocal_view
+                settings:
+                  timezone_override: ''
+                  date_format: 'D, M j Y, g:ia'
+                  event_title: '[node:title]'
+                  location: '[node:field_event_location]'
+                  description: '[node:field_event_description]'
+                  past_events: true
+                third_party_settings: {  }
+              context_mapping:
+                entity: layout_builder.entity
+                view_mode: view_mode
+            additional:
+              layout_builder_styles_style: ''
+            weight: 0
+            a123568d-c573-411b-bbe6-866be42f59e3:
+              uuid: a123568d-c573-411b-bbe6-866be42f59e3
+              region: first
+              configuration:
+                id: 'field_block:node:event:field_event_date'
+                label: 'Event Date'
+                provider: layout_builder
+                label_display: '0'
+                formatter:
+                  label: above
+                  type: smartdate_recurring
+                  settings:
+                    timezone_override: ''
+                    format: default
+                    force_chronological: false
+                    add_classes: 0
+                    past_display: '2'
+                    upcoming_display: '2'
+                    show_next: false
+                  third_party_settings: {  }
+                context_mapping:
+                  entity: layout_builder.entity
+                  view_mode: view_mode
+              additional: {  }
+              weight: 1
           a1c59067-8f3d-491c-8384-a49f2703466a:
             uuid: a1c59067-8f3d-491c-8384-a49f2703466a
             region: second
@@ -140,6 +170,9 @@ third_party_settings:
     entity_view_mode_restriction:
       allowed_blocks: {  }
       allowed_layouts: {  }
+      whitelisted_blocks: {  }
+      blacklisted_blocks: {  }
+    allowed_block_categories: {  }
 id: node.event.default
 targetEntityType: node
 bundle: event

config/sync/lightning_core.versions.yml

@@ -1,5 +1,6 @@
 action: 8.8.1
 address: 1.7.0
+addtocal: 2.0.0-beta3
 admin_toolbar: 1.27.0
 auto_entitylabel: 3.0.0-beta1
 bamboo_twig: 4.1.0

docroot/themes/custom/epa_intranet/assets/LICENSE.md

@@ -1,24 +1,26 @@
 ## A few parts of this project are not in the public domain
 
-### Files licensed under the SIL Open Font License
+### Files licensed under the SIL Open Font License, Version 1.1
 
-The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro) owned by Adobe Systems Incorporated, licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), and copyright 2010, 2012, 2014 [Adobe Systems Incorporated], with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States or other countries.
 
-The Merriweather font files in `src/fonts/merriweather` are v2.001 from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.
+The Merriweather font files in `src/fonts/merriweather` are the version 2.001 files from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.
 
-The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL). Public Sans is a modification of Libre Franklin, copyright [Impallari Type](www.impallari.com).
+The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web). Public Sans is a modification of Libre Franklin, copyright [Impallari Type](www.impallari.com).
 
-The files in `src/img` are from [Font Awesome](http://fontawesome.io/) by Dave Gandy under the [SIL Open Font License 1.1](http://scripts.sil.org/OFL).
+The files in `src/img` are from [Font Awesome](http://fontawesome.io/) by Dave Gandy under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web).
 
 ### Files licensed under the Apache 2.0 License
 
-The Roboto Mono font files in `src/fonts/roboto-mono` are licensed under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).
+The Roboto Mono font files in `src/fonts/roboto-mono` are licensed under the [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt).
+
+The Google Material icons in `src/img/usa-icons` and `src/img/usa-icons-unused` are licensed under the [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt).
 
 ### Files licensed under the MIT license
 
 The files in `src/stylesheets/lib` are from:
 
-* [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
+- [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
 
 #### Full license text for the MIT licensed files: