@eeacms/volto-clms-theme 1.1.55 → 1.1.57

package/CHANGELOG.md

@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.1.57](https://github.com/eea/volto-clms-theme/compare/1.1.56...1.1.57) - 11 October 2023
+
+#### :house: Internal changes
+
+- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`a9415db`](https://github.com/eea/volto-clms-theme/commit/a9415db2a3e4991463efd9ee158267f172e3861d)]
+
+#### :hammer_and_wrench: Others
+
+- readme [Mikel Larreategi - [`3c0ab05`](https://github.com/eea/volto-clms-theme/commit/3c0ab051981a4efad7712bc46182eed9d79fd10f)]
+- remove from addons [Mikel Larreategi - [`89c2e7d`](https://github.com/eea/volto-clms-theme/commit/89c2e7d793193e6bb64642f0b06a01cd3c81108a)]
+- prettier issue fix [Unai - [`8bc0650`](https://github.com/eea/volto-clms-theme/commit/8bc0650918f9fa1065d19d2c15ce153a5fc5abbb)]
+- set a limit of 5 items in the download queue [Mikel Larreategi - [`b81cc83`](https://github.com/eea/volto-clms-theme/commit/b81cc8383165bafbbff52fbeeb365d413051802e)]
+- adjust logo size [Mikel Larreategi - [`b90a72c`](https://github.com/eea/volto-clms-theme/commit/b90a72c07102025a7e90607b25d34611ddd4f4f6)]
+- change footer links [Mikel Larreategi - [`e303335`](https://github.com/eea/volto-clms-theme/commit/e30333510f7f5ee40196a266dfb6297dec3395a6)]
+- video styling [Mikel Larreategi - [`029bcc8`](https://github.com/eea/volto-clms-theme/commit/029bcc8212034bd7a9baa863f7b4957847f84ee2)]
+- use latest eeacms/volto-taxonomy coming from kitkat [Mikel Larreategi - [`c52de1c`](https://github.com/eea/volto-clms-theme/commit/c52de1c91791c6722e7184476affae51c82bae9b)]
+- upgrade @eeacms/volto-embed [Mikel Larreategi - [`eca83af`](https://github.com/eea/volto-clms-theme/commit/eca83af4bde793a17313dec06e856972365d9a8b)]
+- adjust configuration [Mikel Larreategi - [`1bbeeba`](https://github.com/eea/volto-clms-theme/commit/1bbeebaa3491712d7396409ecf952ed92540f977)]
+- copy to customize [Mikel Larreategi - [`7523201`](https://github.com/eea/volto-clms-theme/commit/752320175358a4155ff5060fdff1e583a91b5d1a)]
+- del [Mikel Larreategi - [`e4136cb`](https://github.com/eea/volto-clms-theme/commit/e4136cb905e9b1946f76181678de1f11a8f81806)]
+- copy to customize [Mikel Larreategi - [`2760665`](https://github.com/eea/volto-clms-theme/commit/27606653e40775fb0d4386d506f842fa92b269fc)]
+- copy to customize [Mikel Larreategi - [`1fa587f`](https://github.com/eea/volto-clms-theme/commit/1fa587fa2e61a371aab2b18bc789804d74a9d1ff)]
+### [1.1.56](https://github.com/eea/volto-clms-theme/compare/1.1.55...1.1.56) - 3 October 2023
+
+#### :hammer_and_wrench: Others
+
+- Volto version for Jenkinsfile [Ion Lizarazu - [`cd09c26`](https://github.com/eea/volto-clms-theme/commit/cd09c269c16b85ff16f670218eda69f5e39b184b)]
 ### [1.1.55](https://github.com/eea/volto-clms-theme/compare/1.1.54...1.1.55) - 28 September 2023
 
 #### :bug: Bug Fixes
@@ -128,7 +155,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - fix cart items concat function [Ion Lizarazu - [`4b72249`](https://github.com/eea/volto-clms-theme/commit/4b72249ef17a0cda22661809fce5be7c2d1f6649)]
 - revert Jenkinsfile [Ion Lizarazu - [`64f6cd0`](https://github.com/eea/volto-clms-theme/commit/64f6cd08100357843b507c00d3286d7debe0ef04)]
-- yarn.lock file [Ion Lizarazu - [`8444ad1`](https://github.com/eea/volto-clms-theme/commit/8444ad1606b3939e4609bdd186e5ace2252588a8)]
 - packages.json versions order [Ion Lizarazu - [`4fd7a86`](https://github.com/eea/volto-clms-theme/commit/4fd7a86ab43238841b421e1ed10ebd52ab420a15)]
 - downloadablefilestablewidget param modification [Ion Lizarazu - [`5dd794a`](https://github.com/eea/volto-clms-theme/commit/5dd794a33a8eddd042a753b7ab47e7d2a323b011)]
 - add technical_documents_accordion_text field to the dataset view [Ion Lizarazu - [`96ed1e5`](https://github.com/eea/volto-clms-theme/commit/96ed1e5e2c2b501bd303bc76b333a70ad1614c16)]
@@ -253,7 +279,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - remove NUTS text for area naming in the cart [ionlizarazu - [`062e0a3`](https://github.com/eea/volto-clms-theme/commit/062e0a375f5352bc13c18ff7ec33fad4bcc59f2f)]
 - dependencies [ionlizarazu - [`405ef96`](https://github.com/eea/volto-clms-theme/commit/405ef96090fe7bd4af73a49d3285a92fad712e3b)]
-- yarn.lock [ionlizarazu - [`7132119`](https://github.com/eea/volto-clms-theme/commit/71321195c4dd4fceed67f2f0872f3e24bba61c17)]
 - volto-blocks-grid module mapping [ionlizarazu - [`4fec3ca`](https://github.com/eea/volto-clms-theme/commit/4fec3cabc437322ad92ed90d682250bd123ccaaf)]
 - volto-blocks-grid v7.0.2 [ionlizarazu - [`2557e60`](https://github.com/eea/volto-clms-theme/commit/2557e6039d3cea33ca0bd11a0a3ef4764c611f78)]
 - remove styling from teaser block [ionlizarazu - [`879e684`](https://github.com/eea/volto-clms-theme/commit/879e684057c88f52f60f0fa54cbaa155c7d14688)]
@@ -341,7 +366,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`b4cbf65`](https://github.com/eea/volto-clms-theme/commit/b4cbf6557fbc67f7fc4cea5aa2cb19804f3d7e3c)]
 
 #### :hammer_and_wrench: Others
 
@@ -1540,7 +1564,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
-- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
 - sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
 - lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
 - footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
@@ -1691,7 +1714,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
 - language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
 - toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
 ### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
 
 #### :hammer_and_wrench: Others
@@ -2596,13 +2618,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
-- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
 - add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
 - upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
 - HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
 - babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
 - prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
-- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
 - Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
 - cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
 - some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]

package/DEVELOP.md

@@ -16,12 +16,14 @@
 
 1. Go to http://localhost:3000
 
-1.  Happy hacking!
+1. Initialize git hooks
 
     ```Bash
-    cd src/addons/volto-clms-theme/
+    yarn prepare
     ```
 
+1.  Happy hacking!
+
 ### Or add @eeacms/volto-clms-theme to your Volto project
 
 Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
@@ -48,18 +50,15 @@ Before starting make sure your development environment is properly set. See [Vol
 
 1.  Install
 
-        $ yarn develop
+        $ make develop
         $ yarn
 
 1.  Start backend
 
-        $ docker pull plone
-        $ docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
+        docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend
 
     ...wait for backend to setup and start - `Ready to handle requests`:
 
-        $ docker logs -f plone
-
     ...you can also check http://localhost:8080/Plone
 
 1.  Start frontend

package/Jenkinsfile

@@ -6,7 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "clms.land.copernicus.eu,volto.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = ""
+        VOLTO = "16.24.0"
     }
 
   stages {

package/Makefile

@@ -97,12 +97,12 @@ stylelint:		## Stylelint
 
 .PHONY: stylelint-overrides
 stylelint-overrides:
-	$(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'
+	$(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'
 
 .PHONY: stylelint-fix
 stylelint-fix:	## Fix stylelint
 	$(NODE_MODULES)/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}' --fix
-	$(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix
+	$(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix
 
 .PHONY: prettier
 prettier:		## Prettier

package/README.md

@@ -14,12 +14,12 @@
 [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-clms-theme-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-clms-theme-develop)
 [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-clms-theme-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-clms-theme-develop)
 
-
 [Volto](https://github.com/plone/volto) add-on
 
 ## Features
 
-Demo GIF
+- Theme
+- Custom components
 
 ## Getting started
 
@@ -42,25 +42,25 @@ Go to http://localhost:3000
 
 1. Start Volto frontend
 
-* If you already have a volto project, just update `package.json`:
+- If you already have a volto project, just update `package.json`:
 
-   ```JSON
-   "addons": [
-       "@eeacms/volto-clms-theme"
-   ],
+  ```JSON
+  "addons": [
+      "@eeacms/volto-clms-theme"
+  ],
 
-   "dependencies": {
-       "@eeacms/volto-clms-theme": "*"
-   }
-   ```
+  "dependencies": {
+      "@eeacms/volto-clms-theme": "*"
+  }
+  ```
 
-* If not, create one:
+- If not, create one:
 
-   ```
-   npm install -g yo @plone/generator-volto
-   yo @plone/volto my-volto-project --canary --addon @eeacms/volto-clms-theme
-   cd my-volto-project
-   ```
+  ```
+  npm install -g yo @plone/generator-volto
+  yo @plone/volto my-volto-project --canary --addon @eeacms/volto-clms-theme
+  cd my-volto-project
+  ```
 
 1. Install new add-ons and restart Volto:
 

package/RELEASE.md

@@ -0,0 +1,74 @@
+## Release
+
+### Automatic release using Jenkins
+
+*  The automatic release is started by creating a [Pull Request](../../compare/master...develop) from `develop` to `master`. The pull request status checks correlated to the branch and PR Jenkins jobs need to be processed successfully. 1 review from a github user with rights is mandatory.
+* It runs on every commit on `master` branch, which is protected from direct commits, only allowing pull request merge commits.
+* The automatic release is done by [Jenkins](https://ci.eionet.europa.eu). The status of the release job can be seen both in the Readme.md badges and the green check/red cross/yellow circle near the last commit information. If you click on the icon, you will have the list of checks that were run. The `continuous-integration/jenkins/branch` link goes to the Jenkins job execution webpage.
+* Automated release scripts are located in the `eeacms/gitflow` docker image, specifically [js-release.sh](https://github.com/eea/eea.docker.gitflow/blob/master/src/js-release.sh) script. It  uses the `release-it` tool.
+* As long as a PR request is open from develop to master, the PR Jenkins job will automatically re-create the CHANGELOG.md and package.json files to be production-ready.
+* The version format must be MAJOR.MINOR.PATCH. By default, next release is set to next minor version (with patch 0).
+* You can manually change the version in `package.json`.  The new version must not be already present in the tags/releases of the repository, otherwise it will be automatically increased by the script. Any changes to the version will trigger a `CHANGELOG.md` re-generation.
+* Automated commits and commits with [JENKINS] or [YARN] in the commit log are excluded from `CHANGELOG.md` file.
+
+### Manual release from the develop branch ( beta release )
+
+#### Installation and configuration of release-it
+
+You need to first install the [release-it](https://github.com/release-it/release-it)  client.
+
+   ```
+   npm install -g release-it
+   ```
+
+Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository.
+
+Release-it is a tool that automates 4 important steps in the release process:
+
+1. Version increase in `package.json` ( increased from the current version in `package.json`)
+2. `CHANGELOG.md` automatic generation from commit messages ( grouped by releases )
+3. GitHub release on the commit with the changelog and package.json modification on the develop branch
+4. NPM release ( by default it's disabled, but can be enabled in the configuration file )
+
+To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
+
+   ```
+   export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX
+   ```
+
+ To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN :
+
+   ```
+   echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc
+   ```
+
+#### Using release-it tool
+
+There are 3 yarn scripts that can be run to do the release
+
+##### yarn release-beta
+
+Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
+
+```
+? Select increment (next version):
+❯ prepatch (0.1.1-beta.0)
+  preminor (0.2.0-beta.0)
+  premajor (1.0.0-beta.0)
+  Other, please specify...
+```
+
+##### yarn release-major-beta
+
+Same as `yarn release-beta`, but with premajor version pre-selected.
+
+##### yarn release
+
+Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other.
+
+#### Important notes
+
+> Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST.
+
+> Do not keep Pull Requests from develop to master branches open when you are doing beta releases from the develop branch. As long as a PR to master is open, an automatic script will run on every commit and will update both the version and the changelog to a production-ready state - ( MAJOR.MINOR.PATCH mandatory format for version).
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.55",
+  "version": "1.1.57",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -29,7 +29,6 @@
     "@eeacms/volto-clms-utils",
     "@eeacms/volto-react-table-widget",
     "volto-form-block",
-    "@eeacms/volto-taxonomy",
     "volto-cookie-banner",
     "@eeacms/volto-tableau",
     "@eeacms/volto-embed"
@@ -39,13 +38,12 @@
     "@eeacms/volto-arcgis-block": "*",
     "@eeacms/volto-clms-utils": "0.1.12",
     "@eeacms/volto-columns-block": "6.0.2",
-    "@eeacms/volto-embed": "5.0.1",
+    "@eeacms/volto-embed": "6.0.0",
     "@eeacms/volto-metadata-block": "5.0.1",
     "@eeacms/volto-react-table-widget": "0.1.3",
     "@eeacms/volto-resize-helper": "1.0.1",
     "@eeacms/volto-tableau": "1.3.0",
     "@eeacms/volto-tabs-block": "3.0.1",
-    "@eeacms/volto-taxonomy": "3.0.1",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-brands-svg-icons": "6.4.2",
     "@fortawesome/free-regular-svg-icons": "5.15.3",

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -227,6 +227,9 @@ const CLMSCartContent = (props) => {
   const handleScroll = (ref) => {
     ref.scrollIntoView({ behavior: 'smooth' });
   };
+
+  const { tooManyInQueue } = props;
+
   return (
     <>
       {pagination?.length !== 0 ? (
@@ -524,13 +527,22 @@ const CLMSCartContent = (props) => {
         <h2 style={{ textAlign: 'center' }}>Empty cart</h2>
       )}
       {pagination?.length !== 0 && (
-        <CclButton
-          onClick={() => downloadModal()}
-          disabled={cartSelection.length === 0}
-        >
-          Start downloading
-        </CclButton>
+        <>
+          {tooManyInQueue && (
+            <strong>
+              You have 5 items in the download queue. Wait until the queue is
+              reduced before requesting more.
+            </strong>
+          )}
+          <CclButton
+            onClick={() => downloadModal()}
+            disabled={cartSelection.length === 0 || tooManyInQueue}
+          >
+            Start downloading
+          </CclButton>
+        </>
       )}
+
       <Modal
         // onClose={() => closeModal()}
         // onOpen={() => openModal()}

package/src/components/CLMSDownloadCartView/CLMSDownloadCartView.jsx

@@ -16,6 +16,7 @@ import {
   getFormatConversionTable,
   getProjections,
   getDatasetTimeseries,
+  getDownloadtool,
 } from '../../actions';
 import CLMSCartContent from './CLMSCartContent';
 
@@ -96,6 +97,16 @@ const CLMSDownloadCartView = (props) => {
     return nuts_ids;
   }
 
+  useEffect(() => {
+    dispatch(getDownloadtool());
+  }, [dispatch]);
+
+  const downloadtool = useSelector((state) => state.downloadtool);
+  const tooManyInQueue =
+    Object.keys(downloadtool?.download_queued).length +
+      Object.keys(downloadtool?.download_in_progress).length >=
+    5;
+
   return (
     <>
       <Helmet title={helmetTitle(formatMessage(messages.Cart), content)} />
@@ -141,12 +152,21 @@ const CLMSDownloadCartView = (props) => {
                       </Link>{' '}
                       to check the status of your downloads.
                     </li>
+                    {tooManyInQueue && (
+                      <li>
+                        <strong>
+                          You have 5 items in the download queue. Wait until the
+                          queue is reduced before requesting more.
+                        </strong>
+                      </li>
+                    )}
                   </ul>
                 </div>
               </div>
               <CLMSCartContent
                 localSessionCart={cart}
                 getNutsIDList={getNutsIDList}
+                tooManyInQueue={tooManyInQueue}
               />
             </div>
           </>

package/src/components/CLMSDownloadsView/CLMSDownloadsView.jsx

@@ -184,6 +184,14 @@ const CLMSDownloadsView = (props) => {
                 basic
                 loading={downloadtool.loading || datasetsByUid.loading}
               >
+                <p>
+                  Due to the successful launch of the new CLMS website, we are
+                  experiencing a high load in our download process. Queue times
+                  can be longer than expected, but please don't cancel your
+                  download and try again because you will lose your position in
+                  the download processing queue.
+                </p>
+
                 <CLMSDownloadTask all={props.historicView} />
               </Segment>
             </div>

package/src/customizations/@eeacms/volto-embed/PrivacyProtection/PrivacyProtection.jsx

@@ -0,0 +1,255 @@
+import React, { useState } from 'react';
+import { compose } from 'redux';
+import { useSelector, useDispatch } from 'react-redux';
+import VisibilitySensor from 'react-visibility-sensor';
+import {
+  Placeholder,
+  Dimmer,
+  Loader,
+  Button,
+  Checkbox,
+} from 'semantic-ui-react';
+import { withCookies } from 'react-cookie';
+import { serializeNodes } from '@plone/volto-slate/editor/render';
+import { defineMessages, injectIntl } from 'react-intl';
+import { toast } from 'react-toastify';
+import config from '@plone/volto/registry';
+import { getBaseUrl } from '@plone/volto/helpers';
+import { Toast } from '@plone/volto/components';
+import {
+  getConnectedDataParametersForContext,
+  getFilteredURL,
+} from '@eeacms/volto-datablocks/helpers';
+
+import { createImageUrl } from '@eeacms/volto-embed/PrivacyProtection/helpers';
+import { ProtectionSchema } from '@eeacms/volto-embed/PrivacyProtection/schema';
+
+import '@eeacms/volto-embed/PrivacyProtection/styles.less';
+
+const messages = defineMessages({
+  success: {
+    id: 'Success',
+    defaultMessage: 'Success',
+  },
+  image: {
+    id: 'Live image generated',
+    defaultMessage: 'Live image generated',
+  },
+});
+
+const key = (domain_key) => `accept-${domain_key}`;
+
+const getExpDays = () =>
+  typeof config.settings.embedCookieExpirationDays !== 'undefined'
+    ? config.settings.embedCookieExpirationDays
+    : 90;
+
+function saveCookie(domain_key, cookies) {
+  const date = new Date();
+  date.setDate(date.getDate() + getExpDays());
+
+  cookies.set(key(domain_key), 'true', {
+    path: '/',
+    expires: date,
+  });
+}
+
+function canShow(domain_key, cookies) {
+  return cookies.get(key(domain_key)) === 'true';
+}
+
+const cookieExist = (domain_key, cookies) => cookies.get(key(domain_key));
+
+const CookieWatcher = (domain_key, cookies, pollingRate = 250) => {
+  // state for cookie existence
+  const [exist, setExist] = useState(cookieExist(domain_key, cookies));
+
+  React.useEffect(() => {
+    const interval = setInterval(
+      () => setExist(cookieExist(domain_key, cookies)),
+      pollingRate,
+    );
+    return () => clearInterval(interval);
+  });
+
+  return exist;
+};
+
+const PrivacyProtection = (props) => {
+  const {
+    children,
+    data = {},
+    id,
+    editable,
+    intl,
+    path,
+    cookies,
+    height = '',
+  } = props;
+  const {
+    enabled = false,
+    privacy_statement,
+    background_image: bgImg,
+    privacy_cookie_key = 'esri-maps',
+  } = data.dataprotection || {};
+
+  const [image, setImage] = React.useState(null);
+  const [visible, setVisibility] = useState(false);
+  const defaultShow = canShow(privacy_cookie_key, cookies);
+  const [show, setShow] = useState(defaultShow);
+  const [remember, setRemember] = useState(
+    cookieExist(privacy_cookie_key, cookies) ? defaultShow : true,
+  );
+  const dispatch = useDispatch();
+  const checkExistance = CookieWatcher(privacy_cookie_key, cookies);
+  const connected_data_parameters = useSelector((state) => {
+    return getConnectedDataParametersForContext(
+      state?.connected_data_parameters,
+      state.router?.location?.pathname,
+    );
+  });
+  const url = getFilteredURL(data.url, connected_data_parameters);
+
+  React.useEffect(() => {
+    if (bgImg) {
+      setImage(createImageUrl(bgImg)); //create imageUrl from uploaded image
+    }
+  }, [bgImg]);
+
+  //Effect hook for polling the cookie_key
+  React.useEffect(
+    () => {
+      if (!editable && defaultShow) {
+        setShow(true);
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [checkExistance],
+  );
+
+  //screenshot api
+  React.useEffect(() => {
+    if (enabled && !bgImg && !show && url) {
+      fetch(
+        `${getBaseUrl(
+          '',
+        )}/cors-proxy/https://screenshot.eea.europa.eu/api/v1/retrieve_image_for_url?url=${encodeURIComponent(
+          url,
+        )}&w=1920&waitfor=4000`,
+      )
+        .then((e) => e.blob())
+        .then((blob) => {
+          setImage(URL.createObjectURL(blob));
+          if (editable) {
+            toast.success(
+              <Toast
+                success
+                title={intl.formatMessage(messages.success)}
+                content={intl.formatMessage(messages.image)}
+              />,
+            );
+          }
+        })
+        .catch(() => {
+          if (__DEVELOPMENT__) {
+            /* eslint-disable-next-line */
+            console.log('Please enable your VPN!');
+          }
+        });
+    }
+  }, [enabled, url, path, dispatch, bgImg, show, intl, editable]);
+  return (
+    <VisibilitySensor
+      onChange={(isVisible) => {
+        !visible && isVisible && setVisibility(true);
+      }}
+      partialVisibility={true}
+      offset={{ bottom: 200 }}
+    >
+      {visible ? (
+        <div
+          className="privacy-protection-wrapper"
+          style={{
+            position: 'relative',
+            height: height && (!enabled || !show) ? `${height}px` : 'auto',
+            minHeight: '200px',
+            overflow: 'hidden',
+          }}
+        >
+          {!enabled || show ? (
+            children
+          ) : !__DEVELOPMENT__ && !image ? (
+            <Dimmer active>
+              <Loader />
+            </Dimmer>
+          ) : (
+            <div
+              className="privacy-protection"
+              style={
+                image
+                  ? {
+                      backgroundImage: `url(${image})`,
+                      backgroundRepeat: 'no-repeat',
+                      backgroundSize: 'cover',
+                      backgroundPosition: 'center 0',
+                    }
+                  : {}
+              }
+            >
+              <div className="overlay">
+                <div className="wrapped">
+                  <div className="privacy-button">
+                    <Button
+                      primary
+                      onClick={() => {
+                        setShow(true);
+                        if (remember) {
+                          saveCookie(privacy_cookie_key, cookies);
+                        }
+                      }}
+                    >
+                      Show external content
+                    </Button>
+                  </div>
+
+                  {!editable && (
+                    <div className="privacy-toggle">
+                      <Checkbox
+                        toggle
+                        label="Remember my choice"
+                        id={`remember-choice-${id}`}
+                        onChange={(ev, { checked }) => {
+                          setRemember(checked);
+                        }}
+                        checked={remember}
+                      />
+                    </div>
+                  )}
+
+                  <p className="discreet">
+                    Your choice will be saved in a cookie managed by{' '}
+                    {config.settings.ownDomain || '.eea.europa.eu'} that will
+                    expire in {getExpDays()} days.
+                  </p>
+                  <p className="discreet">
+                    {serializeNodes(
+                      privacy_statement ||
+                        ProtectionSchema().properties.privacy_statement
+                          .defaultValue,
+                    )}
+                  </p>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+      ) : (
+        <Placeholder style={{ height: '100%', width: '100%' }}>
+          <Placeholder.Image rectangular />
+        </Placeholder>
+      )}
+    </VisibilitySensor>
+  );
+};
+
+export default compose(injectIntl, withCookies)(PrivacyProtection);

package/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -9,8 +9,8 @@ import { Link } from 'react-router-dom';
 import { ReactSVG } from 'react-svg';
 import { toast } from 'react-toastify';
 import { compose } from 'redux';
+import validator from 'validator';
 
-import { Toast } from '@plone/volto/components';
 import AtmosphereImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-atmosphere.svg';
 import ClimateImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-climate.svg';
 import EmergencyImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-emergency.svg';
@@ -22,10 +22,10 @@ import EEAImage from '@eeacms/volto-clms-theme/../theme/clms/img/ec-logo-white.s
 import ECImage from '@eeacms/volto-clms-theme/../theme/clms/img/eea-logo.svg';
 import CclFooterColumn from '@eeacms/volto-clms-theme/components/CclFooterColumn/CclFooterColumn';
 import CclFooterMenu from '@eeacms/volto-clms-theme/components/CclTopMainMenu/CclFooterMenu';
+import { faLinkedin } from '@fortawesome/free-brands-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Toast } from '@plone/volto/components';
 import { subscribeTo } from '../../../../../actions';
-import { faLinkedin } from '@fortawesome/free-brands-svg-icons';
-import validator from 'validator';
 
 const messages = defineMessages({
   copernicusServices: {
@@ -74,7 +74,7 @@ const messages = defineMessages({
   },
   jointResearchCenter: {
     id: 'jointResearchCenter',
-    defaultMessage: 'DG Joint Research Center',
+    defaultMessage: 'DG Joint Research Centre',
   },
   expertSupportProvidedBy: {
     id: 'expertSupportProvidedBy',
@@ -493,7 +493,7 @@ class Footer extends Component {
               </div>
               <div className="footer-implemented footer-implemented-ec">
                 <a
-                  href="https://ec.europa.eu/"
+                  href="https://joint-research-centre.ec.europa.eu/index_en"
                   target="_blank"
                   rel="noreferrer"
                 >
@@ -508,12 +508,6 @@ class Footer extends Component {
                     className="ccl-ec-svg-wrapper"
                     wrapper="div"
                   />
-                </a>
-                <a
-                  href="https://joint-research-centre.ec.europa.eu/index_en"
-                  target="_blank"
-                  rel="noreferrer"
-                >
                   <span>
                     {this.props.intl.formatMessage(
                       messages.jointResearchCenter,

package/src/customizations/volto/components/theme/Logo/Logo.jsx

@@ -2,15 +2,15 @@
  * Logo component.
  * @module components/theme/Logo/Logo
  */
-
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
-import { Image } from 'semantic-ui-react';
 import { useSelector } from 'react-redux';
-import config from '@plone/volto/registry';
+import { Link } from 'react-router-dom';
+import { Image } from 'semantic-ui-react';
+
+import LandImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-land-text-2.svg';
 import CopernicusImage from '@eeacms/volto-clms-theme/../theme/clms/img/EU-Cop-logo.svg';
-import LandImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-land-text.svg';
+import config from '@plone/volto/registry';
 
 const messages = defineMessages({
   site: {
@@ -69,7 +69,7 @@ const Logo = () => {
             alt={intl.formatMessage(messages.plonesite)}
             title={intl.formatMessage(messages.plonesite)}
             height={44}
-            width={215}
+            width={256}
           />
         </Link>
       </div>

package/src/index.js

@@ -135,6 +135,7 @@ const applyConfig = (config) => {
         component: CustomMatomoAppExtra,
       },
     ],
+    querystringSearchGet: true,
     nonContentRoutes: [
       ...config.settings.nonContentRoutes,
       '/profile',

package/theme/clms/img/ccl-icon-land-text-2.svg

@@ -0,0 +1,32 @@
+<svg width="749" height="160" viewBox="0 0 749 160" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M106.434 102.279L107.468 97.9951L108.06 98.2906C104.07 90.3128 106.139 81.0054 106.434 80.4144L107.468 76.13L108.06 76.4255C104.07 68.4477 106.139 59.1403 106.434 58.5493L107.468 54.265L111.754 55.8901C112.345 56.1856 113.084 56.481 113.675 56.6288V39.1958H91.214V111.587H86.6332V71.9934H81.3135V58.9926H61.5126V111.735H56.9318V85.5852H51.6122V59.1403H38.313C36.0965 65.6407 34.7666 72.7321 34.7666 80.2667C34.7666 93.8585 39.0519 106.564 46.4403 116.758H107.173C104.513 109.666 106.139 102.575 106.434 102.279Z" fill="#A0B128"/>
+<path d="M157.266 49.5371C146.479 22.2058 120.176 3 89.2929 3C48.8045 3 16 36.0931 16 77.0162C16 117.939 48.8045 150.885 89.2929 150.885C100.967 150.885 111.754 148.225 121.802 143.35C121.802 143.35 122.097 143.35 121.802 143.055C121.802 142.759 121.506 143.055 121.506 143.055C113.97 146.009 105.843 147.634 97.4202 147.634C60.6259 147.634 30.9246 117.348 30.9246 79.971C30.9246 42.5935 60.7737 12.3074 97.4202 12.3074C123.723 12.3074 146.184 27.5243 156.823 49.5371C156.971 49.5371 156.971 49.8326 157.266 49.5371Z" fill="#A0B128"/>
+<path d="M129.486 127.247C150.617 124.587 145.149 103.166 145.149 103.166C145.149 103.166 126.383 110.996 129.486 127.247Z" fill="#A0B128"/>
+<path d="M129.486 105.234C150.617 102.575 145.149 81.1528 145.149 81.1528C145.149 81.1528 126.383 88.9829 129.486 105.234Z" fill="#A0B128"/>
+<path d="M113.527 105.086C111.606 104.052 109.98 103.461 109.98 103.461C109.98 103.461 108.355 110.109 110.719 116.757C112.64 121.633 116.63 126.212 125.792 127.394C128.156 115.28 118.846 108.041 113.527 105.086Z" fill="#A0B128"/>
+<path d="M113.527 83.0733C111.606 82.0392 109.98 81.4482 109.98 81.4482C109.98 81.4482 107.321 92.3808 113.527 99.6199C115.891 102.575 119.733 104.791 125.792 105.529C128.156 93.4149 118.846 86.0281 113.527 83.0733Z" fill="#A0B128"/>
+<path d="M125.792 83.3692C128.008 71.4025 118.846 64.1633 113.527 61.2086C111.606 60.1744 109.98 59.5835 109.98 59.5835C109.98 59.5835 107.321 70.516 113.527 77.7551C115.891 80.4144 119.881 82.6305 125.792 83.3692Z" fill="#A0B128"/>
+<path d="M129.486 83.3689C150.469 80.7097 145.149 59.4355 145.149 59.4355C145.149 59.4355 126.383 67.1179 129.486 83.3689Z" fill="#A0B128"/>
+<path d="M127.86 39.1958C127.86 39.1958 112.64 51.1625 127.86 67.4136C142.637 51.0148 127.86 39.1958 127.86 39.1958Z" fill="#A0B128"/>
+<path d="M197.607 50.7189V57.6625H171.304V12.7505H179.579V50.7189H197.607Z" fill="#A0B128"/>
+<path d="M201.597 30.1837C205.291 26.7858 209.724 25.1606 214.748 25.1606C216.669 25.1606 218.294 25.4561 219.772 26.0471C221.25 26.638 222.432 27.5244 223.466 28.5586C224.501 29.5928 225.239 30.9224 225.831 32.3998C226.422 33.8771 226.569 35.5022 226.569 37.4228V57.5151H223.171C222.432 57.5151 221.841 57.3673 221.545 57.2196C221.102 57.0718 220.806 56.6286 220.659 55.8899L219.92 53.5262C219.181 54.2648 218.294 54.8558 217.556 55.4467C216.817 56.0377 215.93 56.4809 215.191 56.7764C214.452 57.0718 213.418 57.3673 212.531 57.6628C211.645 57.8105 210.61 57.9583 209.428 57.9583C208.098 57.9583 206.768 57.8105 205.734 57.3673C204.552 57.0718 203.665 56.4809 202.779 55.7422C201.892 55.0035 201.301 54.1171 200.858 53.0829C200.414 52.0488 200.119 50.7191 200.119 49.3895C200.119 48.6508 200.267 47.7644 200.562 47.0257C200.858 46.287 201.301 45.4006 201.892 44.8097C202.483 44.2187 203.222 43.3323 204.256 42.7414C205.291 42.1504 206.473 41.5595 207.803 41.1162C209.281 40.673 210.906 40.2298 212.679 39.9343C214.6 39.6389 216.669 39.4911 219.181 39.3434V37.4228C219.181 35.3545 218.738 33.7294 217.851 32.6952C216.964 31.6611 215.635 31.2179 213.861 31.2179C212.679 31.2179 211.645 31.3656 210.758 31.6611C209.872 31.9565 209.281 32.252 208.542 32.6952C207.951 32.9907 207.36 33.4339 206.916 33.7294C206.473 34.0249 205.882 34.1726 205.291 34.1726C204.7 34.1726 204.256 34.0249 203.961 33.7294C203.665 33.4339 203.222 33.1384 203.074 32.6952L201.597 30.1837ZM219.181 43.9232C216.964 44.071 215.043 44.2187 213.566 44.5142C212.088 44.8097 210.906 45.1051 209.872 45.5483C208.837 45.9916 208.246 46.4348 207.951 47.0257C207.507 47.6167 207.36 48.2076 207.36 48.9463C207.36 50.2759 207.803 51.3101 208.542 51.901C209.281 52.492 210.315 52.7875 211.645 52.7875C213.27 52.7875 214.6 52.492 215.782 51.901C216.964 51.3101 217.999 50.4237 219.181 49.2418V43.9232Z" fill="#A0B128"/>
+<path d="M241.051 29.5925C241.642 29.0015 242.381 28.4106 243.119 27.8196C243.858 27.2287 244.597 26.7855 245.336 26.49C246.075 26.0468 246.961 25.7513 247.848 25.6036C248.735 25.4558 249.769 25.3081 250.803 25.3081C252.577 25.3081 254.054 25.6036 255.384 26.1945C256.714 26.7855 257.896 27.6719 258.783 28.7061C259.669 29.7402 260.408 31.0698 260.852 32.5472C261.295 34.0246 261.59 35.6497 261.59 37.4225V57.6625H253.907V37.2748C253.907 35.3542 253.463 33.8769 252.577 32.695C251.69 31.6608 250.36 31.0698 248.439 31.0698C247.109 31.0698 245.927 31.3653 244.745 31.9563C243.563 32.5472 242.528 33.4336 241.494 34.4678V57.5148H233.81V25.7513H238.539C239.573 25.7513 240.164 26.1945 240.46 27.081L241.051 29.5925Z" fill="#A0B128"/>
+<path d="M296.464 11.4209V57.5148H291.735C290.701 57.5148 290.11 57.0716 289.814 56.1852L289.223 53.0827C287.893 54.5601 286.416 55.742 284.79 56.6284C283.165 57.5148 281.244 57.958 279.027 57.958C277.254 57.958 275.629 57.6626 274.299 56.9239C272.821 56.1852 271.639 55.151 270.604 53.8214C269.57 52.4918 268.683 50.7189 268.24 48.6506C267.797 46.5823 267.354 44.3662 267.354 41.707C267.354 39.3432 267.649 37.1271 268.388 35.0588C268.979 32.9905 270.013 31.2177 271.195 29.7403C272.378 28.2629 273.855 27.081 275.481 26.1946C277.106 25.3082 279.027 24.865 281.096 24.865C282.869 24.865 284.347 25.1604 285.677 25.7514C287.007 26.3423 288.041 27.081 289.075 27.9674V11.4209H296.464ZM288.78 33.8769C287.893 32.8428 287.007 32.1041 285.972 31.6609C284.938 31.2177 283.904 31.0699 282.721 31.0699C281.539 31.0699 280.505 31.2177 279.618 31.6609C278.732 32.1041 277.845 32.695 277.254 33.5814C276.663 34.4679 276.072 35.6498 275.776 36.9794C275.481 38.309 275.185 39.9341 275.185 41.707C275.185 43.6276 275.333 45.1049 275.629 46.4346C275.924 47.7642 276.367 48.7984 276.958 49.537C277.55 50.4235 278.141 51.0144 279.027 51.3099C279.766 51.6054 280.8 51.9008 281.687 51.9008C283.312 51.9008 284.642 51.6054 285.825 50.8667C287.007 50.2757 288.041 49.2416 288.928 48.0597V33.8769H288.78Z" fill="#A0B128"/>
+<path d="M219.92 87.21V132.122H212.532V103.018C212.532 101.836 212.532 100.654 212.679 99.3244L199.085 124.735C198.494 125.917 197.459 126.508 196.129 126.508H195.095C193.765 126.508 192.731 125.917 192.14 124.735L178.397 99.1767C178.397 99.9153 178.545 100.506 178.545 101.245C178.545 101.836 178.545 102.575 178.545 103.018V131.974H171.156V87.21H177.511C177.954 87.21 178.249 87.21 178.545 87.21C178.84 87.21 178.988 87.21 179.284 87.3577C179.432 87.5054 179.727 87.5054 179.875 87.8009C180.023 88.0964 180.17 88.2441 180.318 88.5396L193.765 113.507C194.061 114.098 194.504 114.837 194.799 115.575C195.095 116.314 195.39 117.053 195.686 117.792C195.982 117.053 196.277 116.314 196.573 115.575C196.868 114.837 197.164 114.246 197.607 113.507L210.906 88.6873C211.054 88.3919 211.202 88.0964 211.497 87.9486C211.793 87.8009 211.94 87.6532 212.088 87.5054C212.236 87.3577 212.532 87.3577 212.827 87.3577C213.123 87.3577 213.418 87.3577 213.861 87.3577H219.92V87.21Z" fill="#A0B128"/>
+<path d="M241.937 99.7676C244.302 99.7676 246.371 100.211 248.439 100.949C250.36 101.688 251.986 102.87 253.463 104.2C254.793 105.677 255.828 107.302 256.714 109.37C257.601 111.439 257.896 113.655 257.896 116.166C257.896 118.678 257.453 120.894 256.714 122.962C255.975 125.031 254.941 126.656 253.463 128.133C252.133 129.61 250.36 130.645 248.439 131.383C246.518 132.122 244.302 132.565 241.937 132.565C239.573 132.565 237.357 132.122 235.436 131.383C233.515 130.645 231.889 129.463 230.412 128.133C229.082 126.656 227.9 125.031 227.161 122.962C226.422 120.894 225.979 118.678 225.979 116.166C225.979 113.655 226.422 111.439 227.161 109.37C227.9 107.302 228.934 105.677 230.412 104.2C231.741 102.722 233.515 101.688 235.436 100.949C237.357 100.063 239.573 99.7676 241.937 99.7676ZM241.937 126.656C244.597 126.656 246.518 125.769 247.848 123.996C249.178 122.224 249.769 119.564 249.769 116.166C249.769 112.768 249.178 110.109 247.848 108.336C246.518 106.563 244.597 105.677 241.937 105.677C239.278 105.677 237.209 106.563 236.027 108.336C234.697 110.109 234.106 112.768 234.106 116.166C234.106 119.564 234.697 122.224 236.027 123.996C237.357 125.769 239.278 126.656 241.937 126.656Z" fill="#A0B128"/>
+<path d="M270.604 104.052C271.195 103.461 271.934 102.87 272.673 102.279C273.412 101.688 274.151 101.245 274.89 100.949C275.629 100.506 276.515 100.211 277.402 100.063C278.288 99.9153 279.323 99.7676 280.357 99.7676C282.13 99.7676 283.608 100.063 284.938 100.654C286.268 101.245 287.45 102.131 288.337 103.166C289.223 104.2 289.962 105.529 290.405 107.007C290.849 108.484 291.144 110.109 291.144 111.882V132.122H283.46V111.734C283.46 109.814 283.017 108.336 282.13 107.154C281.244 106.12 279.914 105.529 277.993 105.529C276.663 105.529 275.481 105.825 274.299 106.416C273.116 107.007 272.082 107.893 271.048 108.927V131.974H263.364V100.211H268.092C269.127 100.211 269.718 100.654 270.013 101.54L270.604 104.052Z" fill="#A0B128"/>
+<path d="M307.398 90.9036C307.398 91.4946 307.251 92.2333 306.955 92.8242C306.66 93.4152 306.364 93.8584 305.921 94.3016C305.478 94.7448 304.886 95.0403 304.295 95.3358C303.704 95.6312 303.113 95.779 302.374 95.779C301.783 95.779 301.044 95.6312 300.453 95.3358C299.862 95.0403 299.419 94.7448 298.976 94.3016C298.532 93.8584 298.237 93.4152 297.941 92.8242C297.646 92.2333 297.498 91.6423 297.498 90.9036C297.498 90.165 297.646 89.574 297.941 88.9831C298.237 88.3921 298.532 87.8012 298.976 87.5057C299.419 87.2102 299.862 86.767 300.453 86.4715C301.044 86.1761 301.636 86.0283 302.374 86.0283C303.113 86.0283 303.704 86.1761 304.295 86.4715C304.886 86.767 305.478 87.0625 305.921 87.5057C306.364 87.9489 306.66 88.3921 306.955 88.9831C307.251 89.574 307.398 90.165 307.398 90.9036ZM306.364 100.211V131.975H298.68V100.211H306.364Z" fill="#A0B128"/>
+<path d="M324.835 132.565C322.028 132.565 319.959 131.827 318.481 130.201C317.004 128.576 316.265 126.508 316.265 123.701V105.973H313.014C312.571 105.973 312.275 105.825 311.979 105.529C311.684 105.234 311.536 104.791 311.536 104.348V101.245L316.708 100.359L318.333 91.6421C318.481 91.1989 318.629 90.9034 318.925 90.608C319.22 90.3125 319.516 90.3125 320.107 90.3125H324.096V100.359H332.667V105.825H324.096V123.11C324.096 124.144 324.392 124.883 324.835 125.474C325.279 126.065 326.017 126.36 326.904 126.36C327.347 126.36 327.791 126.36 328.086 126.213C328.382 126.065 328.677 125.917 328.973 125.917C329.268 125.769 329.416 125.622 329.564 125.622C329.712 125.622 330.007 125.474 330.155 125.474C330.45 125.474 330.598 125.474 330.746 125.622C330.894 125.769 331.042 125.917 331.189 126.065L333.554 129.758C332.371 130.645 331.189 131.383 329.712 131.827C327.938 132.27 326.461 132.565 324.835 132.565Z" fill="#A0B128"/>
+<path d="M351.138 99.7676C353.502 99.7676 355.571 100.211 357.64 100.949C359.561 101.688 361.186 102.87 362.664 104.2C363.994 105.677 365.028 107.302 365.915 109.37C366.801 111.439 367.097 113.655 367.097 116.166C367.097 118.678 366.654 120.894 365.915 122.962C365.176 125.031 364.141 126.656 362.664 128.133C361.334 129.61 359.561 130.645 357.64 131.383C355.719 132.122 353.502 132.565 351.138 132.565C348.774 132.565 346.557 132.122 344.636 131.383C342.715 130.645 341.09 129.463 339.612 128.133C338.282 126.656 337.1 125.031 336.361 122.962C335.622 120.894 335.179 118.678 335.179 116.166C335.179 113.655 335.622 111.439 336.361 109.37C337.1 107.302 338.134 105.677 339.612 104.2C340.942 102.722 342.715 101.688 344.636 100.949C346.557 100.063 348.774 99.7676 351.138 99.7676ZM351.138 126.656C353.798 126.656 355.719 125.769 357.049 123.996C358.379 122.224 358.97 119.564 358.97 116.166C358.97 112.768 358.379 110.109 357.049 108.336C355.719 106.563 353.798 105.677 351.138 105.677C348.478 105.677 346.409 106.563 345.227 108.336C343.897 110.109 343.306 112.768 343.306 116.166C343.306 119.564 343.897 122.224 345.227 123.996C346.557 125.769 348.478 126.656 351.138 126.656Z" fill="#A0B128"/>
+<path d="M379.953 105.677C380.987 103.756 382.169 102.279 383.499 101.245C384.829 100.211 386.454 99.6196 388.375 99.6196C389.853 99.6196 391.035 99.9151 391.922 100.654L391.479 106.416C391.331 106.859 391.183 107.006 391.035 107.154C390.888 107.302 390.592 107.45 390.296 107.45C390.001 107.45 389.558 107.45 388.967 107.302C388.375 107.154 387.784 107.154 387.193 107.154C386.307 107.154 385.568 107.302 384.977 107.597C384.386 107.893 383.647 108.188 383.204 108.632C382.612 109.075 382.169 109.666 381.874 110.257C381.43 110.848 381.135 111.734 380.692 112.473V132.122H373.008V100.211H377.441C378.179 100.211 378.771 100.358 379.066 100.654C379.362 100.949 379.509 101.392 379.657 102.131L379.953 105.677Z" fill="#A0B128"/>
+<path d="M404.925 90.9036C404.925 91.4946 404.778 92.2333 404.482 92.8242C404.187 93.4152 403.891 93.8584 403.448 94.3016C403.004 94.7448 402.413 95.0403 401.822 95.3358C401.231 95.6312 400.64 95.779 399.901 95.779C399.31 95.779 398.571 95.6312 397.98 95.3358C397.389 95.0403 396.946 94.7448 396.503 94.3016C396.059 93.8584 395.764 93.4152 395.468 92.8242C395.173 92.2333 395.025 91.6423 395.025 90.9036C395.025 90.165 395.173 89.574 395.468 88.9831C395.764 88.3921 396.059 87.8012 396.503 87.5057C396.946 87.2102 397.389 86.767 397.98 86.4715C398.571 86.1761 399.162 86.0283 399.901 86.0283C400.64 86.0283 401.231 86.1761 401.822 86.4715C402.413 86.767 403.004 87.0625 403.448 87.5057C403.891 87.9489 404.187 88.3921 404.482 88.9831C404.778 89.574 404.925 90.165 404.925 90.9036ZM403.743 100.211V131.975H396.059V100.211H403.743Z" fill="#A0B128"/>
+<path d="M418.816 104.052C419.407 103.461 420.145 102.87 420.884 102.279C421.623 101.688 422.362 101.245 423.101 100.949C423.84 100.506 424.726 100.211 425.613 100.063C426.5 99.9153 427.534 99.7676 428.568 99.7676C430.341 99.7676 431.819 100.063 433.149 100.654C434.479 101.245 435.661 102.131 436.548 103.166C437.434 104.2 438.173 105.529 438.616 107.007C439.06 108.484 439.355 110.109 439.355 111.882V132.122H431.671V111.734C431.671 109.814 431.228 108.336 430.342 107.154C429.455 106.12 428.125 105.529 426.204 105.529C424.874 105.529 423.692 105.825 422.51 106.416C421.328 107.007 420.293 107.893 419.259 108.927V131.974H411.575V100.211H416.304C417.338 100.211 417.929 100.654 418.225 101.54L418.816 104.052Z" fill="#A0B128"/>
+<path d="M474.524 101.245V104.052C474.524 104.938 473.933 105.529 472.899 105.677L470.091 106.268C470.534 107.302 470.682 108.632 470.682 109.814C470.682 111.439 470.387 112.768 469.795 114.098C469.204 115.428 468.318 116.462 467.136 117.348C465.954 118.235 464.771 118.973 463.146 119.417C461.52 119.86 460.043 120.155 458.27 120.155C457.679 120.155 457.087 120.155 456.496 120.008C455.905 119.86 455.314 119.86 454.723 119.712C453.689 120.303 453.245 121.042 453.245 121.78C453.245 122.371 453.541 122.962 454.132 123.258C454.723 123.553 455.462 123.701 456.496 123.849C457.531 123.997 458.565 123.997 459.747 124.144C460.929 124.144 462.259 124.292 463.589 124.292C464.919 124.292 466.101 124.587 467.431 124.883C468.613 125.178 469.795 125.622 470.682 126.065C471.716 126.656 472.455 127.394 473.046 128.281C473.637 129.315 473.933 130.497 473.933 131.974C473.933 133.452 473.637 134.781 472.899 136.111C472.16 137.441 471.273 138.622 469.943 139.657C468.613 140.691 466.988 141.577 465.067 142.168C463.146 142.759 460.929 143.055 458.565 143.055C456.201 143.055 454.132 142.759 452.359 142.316C450.586 141.873 449.108 141.282 447.926 140.395C446.744 139.657 445.857 138.77 445.266 137.736C444.675 136.702 444.379 135.668 444.379 134.634C444.379 133.156 444.823 131.827 445.709 130.94C446.596 129.906 447.778 129.167 449.403 128.576C448.517 128.133 447.926 127.542 447.335 126.804C446.891 126.065 446.596 125.178 446.596 123.997C446.596 123.553 446.744 122.962 446.891 122.519C447.039 122.076 447.335 121.485 447.63 121.042C447.926 120.599 448.369 120.008 448.96 119.564C449.403 119.121 450.142 118.678 450.733 118.383C449.108 117.496 447.778 116.314 446.891 114.837C446.005 113.359 445.562 111.734 445.562 109.814C445.562 108.189 445.857 106.859 446.448 105.529C447.039 104.2 447.926 103.166 449.108 102.279C450.29 101.393 451.62 100.654 453.098 100.211C454.575 99.7676 456.349 99.4722 458.122 99.4722C459.452 99.4722 460.782 99.6199 461.964 99.9154C463.146 100.211 464.328 100.654 465.215 101.097H474.524V101.245ZM466.988 133.452C466.988 132.861 466.84 132.27 466.397 131.974C465.954 131.531 465.51 131.236 464.919 131.088C464.328 130.94 463.589 130.645 462.703 130.645C461.816 130.645 460.929 130.497 460.043 130.349C459.008 130.349 458.122 130.201 457.087 130.201C456.053 130.201 455.019 130.054 454.132 129.906C453.245 130.349 452.654 130.94 452.063 131.531C451.472 132.122 451.324 132.861 451.324 133.747C451.324 134.338 451.472 134.781 451.768 135.372C452.063 135.815 452.507 136.259 453.098 136.702C453.689 137.145 454.428 137.293 455.462 137.588C456.496 137.884 457.679 137.884 459.008 137.884C460.486 137.884 461.668 137.736 462.703 137.588C463.737 137.441 464.624 137.145 465.215 136.702C465.953 136.259 466.397 135.815 466.692 135.372C466.84 134.634 466.988 134.043 466.988 133.452ZM458.27 115.28C459.156 115.28 460.043 115.132 460.782 114.837C461.52 114.541 462.112 114.246 462.555 113.803C462.998 113.359 463.441 112.768 463.589 112.178C463.885 111.587 463.885 110.848 463.885 110.109C463.885 108.484 463.441 107.302 462.407 106.416C461.52 105.529 460.043 105.086 458.122 105.086C456.201 105.086 454.871 105.529 453.837 106.416C452.802 107.302 452.359 108.632 452.359 110.109C452.359 110.848 452.507 111.587 452.654 112.178C452.802 112.768 453.245 113.359 453.689 113.803C454.132 114.246 454.723 114.689 455.462 114.837C456.201 114.985 457.383 115.28 458.27 115.28Z" fill="#A0B128"/>
+<path d="M519.593 95.3356C519.298 95.7788 519.15 96.0743 518.855 96.222C518.559 96.3698 518.263 96.5175 517.82 96.5175C517.377 96.5175 516.934 96.3698 516.342 96.0743C515.751 95.7788 515.16 95.3356 514.569 95.0401C513.978 94.7447 513.092 94.3015 512.057 94.006C511.171 93.7105 509.988 93.5628 508.659 93.5628C507.476 93.5628 506.442 93.7105 505.555 94.006C504.669 94.3015 503.93 94.7447 503.339 95.1879C502.748 95.6311 502.305 96.222 502.009 96.9607C501.713 97.6994 501.566 98.4381 501.566 99.1768C501.566 100.211 501.861 101.097 502.452 101.836C503.043 102.575 503.782 103.166 504.817 103.609C505.851 104.052 506.885 104.495 508.067 104.939C509.25 105.382 510.58 105.677 511.909 106.268C513.239 106.859 514.422 107.302 515.751 107.746C516.934 108.336 518.116 109.075 519.002 109.962C520.037 110.848 520.776 112.03 521.367 113.212C521.958 114.541 522.253 116.167 522.253 117.939C522.253 120.008 521.958 121.928 521.219 123.701C520.48 125.474 519.446 126.951 518.116 128.281C516.786 129.611 515.16 130.645 513.239 131.383C511.318 132.122 509.102 132.565 506.59 132.565C505.112 132.565 503.782 132.418 502.305 132.122C500.975 131.827 499.645 131.383 498.315 130.94C496.985 130.497 495.803 129.758 494.768 129.02C493.586 128.281 492.7 127.542 491.813 126.656L494.325 122.667C494.473 122.371 494.768 122.076 495.064 121.928C495.359 121.781 495.803 121.633 496.098 121.633C496.542 121.633 497.133 121.781 497.724 122.224C498.315 122.667 499.054 123.11 499.792 123.701C500.531 124.292 501.566 124.735 502.748 125.178C503.782 125.622 505.112 125.769 506.738 125.769C509.102 125.769 511.023 125.178 512.205 124.144C513.535 122.962 514.126 121.337 514.126 119.269C514.126 118.087 513.83 117.201 513.239 116.314C512.648 115.576 511.909 114.985 510.875 114.394C509.841 113.803 508.806 113.507 507.624 113.064C506.442 112.769 505.112 112.325 503.782 111.882C502.452 111.439 501.27 110.996 499.94 110.405C498.61 109.814 497.576 109.075 496.689 108.189C495.803 107.302 494.916 106.12 494.325 104.643C493.734 103.313 493.438 101.541 493.438 99.4723C493.438 97.8471 493.734 96.222 494.473 94.7447C495.064 93.1196 496.098 91.7899 497.28 90.608C498.463 89.4261 500.088 88.392 501.861 87.6533C503.634 86.9146 505.703 86.6191 508.067 86.6191C510.727 86.6191 513.092 87.0623 515.456 87.801C517.672 88.6875 519.593 89.7216 521.219 91.3467L519.593 95.3356Z" fill="#A0B128"/>
+<path d="M534.37 117.053C534.518 118.678 534.813 120.155 535.257 121.337C535.7 122.519 536.291 123.553 537.03 124.292C537.769 125.031 538.655 125.622 539.69 126.065C540.724 126.508 541.906 126.656 543.088 126.656C544.271 126.656 545.453 126.508 546.339 126.213C547.226 125.917 547.965 125.622 548.704 125.179C549.442 124.735 550.033 124.44 550.477 124.144C550.92 123.849 551.511 123.701 551.954 123.701C552.546 123.701 553.137 123.997 553.432 124.44L555.649 127.247C554.762 128.281 553.875 129.02 552.841 129.758C551.807 130.497 550.625 130.94 549.59 131.383C548.408 131.827 547.226 132.122 546.044 132.27C544.862 132.418 543.679 132.565 542.645 132.565C540.429 132.565 538.36 132.27 536.439 131.531C534.518 130.793 532.892 129.758 531.415 128.281C529.937 126.804 528.903 125.031 528.164 122.962C527.425 120.894 526.982 118.383 526.982 115.576C526.982 113.36 527.277 111.291 528.016 109.518C528.755 107.598 529.789 105.973 530.971 104.495C532.301 103.018 533.927 101.984 535.848 101.097C537.769 100.211 539.837 99.9155 542.202 99.9155C544.271 99.9155 546.044 100.211 547.817 100.95C549.442 101.541 550.92 102.575 552.25 103.757C553.58 104.939 554.467 106.564 555.058 108.337C555.649 110.109 556.092 112.178 556.092 114.394C556.092 115.576 555.944 116.314 555.649 116.758C555.353 117.201 554.91 117.348 554.171 117.348H534.37V117.053ZM548.999 112.473C548.999 111.439 548.851 110.553 548.556 109.666C548.26 108.78 547.817 108.041 547.226 107.302C546.635 106.564 545.896 106.12 545.157 105.677C544.418 105.234 543.236 105.086 542.202 105.086C539.985 105.086 538.212 105.677 537.03 107.007C535.7 108.337 534.961 110.109 534.666 112.325H548.999V112.473Z" fill="#A0B128"/>
+<path d="M568.8 105.677C569.835 103.756 571.017 102.279 572.347 101.245C573.677 100.211 575.302 99.6196 577.223 99.6196C578.701 99.6196 579.883 99.9151 580.769 100.654L580.326 106.416C580.178 106.859 580.031 107.006 579.883 107.154C579.735 107.302 579.439 107.45 579.144 107.45C578.848 107.45 578.405 107.45 577.814 107.302C577.223 107.154 576.632 107.154 576.041 107.154C575.154 107.154 574.415 107.302 573.824 107.597C573.233 107.893 572.494 108.188 572.051 108.632C571.46 109.075 571.017 109.666 570.721 110.257C570.278 110.848 569.982 111.734 569.539 112.473V132.122H561.56V100.211H565.993C566.731 100.211 567.323 100.358 567.618 100.654C567.914 100.949 568.061 101.392 568.209 102.131L568.8 105.677Z" fill="#A0B128"/>
+<path d="M613.426 100.211L600.866 131.974H593.921L581.36 100.211H587.714C588.305 100.211 588.749 100.359 589.192 100.654C589.635 100.95 589.783 101.245 589.931 101.688L596.137 118.678C596.433 119.712 596.728 120.599 597.024 121.633C597.319 122.519 597.467 123.553 597.615 124.44C597.763 123.553 598.058 122.519 598.354 121.633C598.649 120.746 598.945 119.712 599.24 118.678L605.447 101.688C605.594 101.245 605.89 100.95 606.185 100.654C606.629 100.359 607.072 100.211 607.515 100.211H613.426Z" fill="#A0B128"/>
+<path d="M626.43 90.9036C626.43 91.4946 626.282 92.2333 625.986 92.8242C625.691 93.4152 625.395 93.8584 624.952 94.3016C624.509 94.7448 623.918 95.0403 623.327 95.3358C622.736 95.6312 622.144 95.779 621.406 95.779C620.815 95.779 620.076 95.6312 619.485 95.3358C618.894 95.0403 618.45 94.7448 618.007 94.3016C617.564 93.8584 617.268 93.4152 616.973 92.8242C616.677 92.2333 616.529 91.6423 616.529 90.9036C616.529 90.165 616.677 89.574 616.973 88.9831C617.268 88.3921 617.564 87.8012 618.007 87.5057C618.45 87.2102 618.894 86.767 619.485 86.4715C620.076 86.1761 620.667 86.0283 621.406 86.0283C622.144 86.0283 622.736 86.1761 623.327 86.4715C623.918 86.767 624.509 87.0625 624.952 87.5057C625.395 87.9489 625.691 88.3921 625.986 88.9831C626.282 89.574 626.43 90.165 626.43 90.9036ZM625.395 100.211V131.975H617.711V100.211H625.395Z" fill="#A0B128"/>
+<path d="M656.131 106.859C655.836 107.154 655.688 107.45 655.392 107.598C655.244 107.745 654.801 107.893 654.506 107.893C654.062 107.893 653.767 107.745 653.323 107.598C652.88 107.45 652.437 107.154 651.994 106.859C651.55 106.563 650.811 106.268 650.22 106.12C649.629 105.972 648.595 105.825 647.561 105.825C646.231 105.825 645.048 106.12 644.014 106.563C642.98 107.007 642.093 107.745 641.502 108.632C640.763 109.518 640.32 110.7 640.024 111.882C639.729 113.064 639.581 114.689 639.581 116.314C639.581 117.939 639.729 119.564 640.172 120.894C640.468 122.223 641.059 123.258 641.798 124.292C642.536 125.178 643.275 125.917 644.31 126.36C645.344 126.803 646.378 127.099 647.561 127.099C648.743 127.099 649.777 126.951 650.516 126.656C651.255 126.36 651.846 126.065 652.437 125.621C653.028 125.326 653.471 124.883 653.767 124.587C654.21 124.292 654.506 124.144 655.097 124.144C655.688 124.144 656.131 124.44 656.427 124.883L658.643 127.69C657.757 128.724 656.87 129.463 655.836 130.201C654.801 130.94 653.767 131.383 652.732 131.826C651.698 132.27 650.516 132.565 649.481 132.713C648.299 132.861 647.265 133.008 646.083 133.008C644.162 133.008 642.241 132.713 640.468 131.974C638.694 131.235 637.217 130.201 635.887 128.724C634.557 127.247 633.523 125.621 632.784 123.553C632.045 121.485 631.602 119.121 631.602 116.609C631.602 114.246 631.897 112.177 632.636 110.109C633.375 108.041 634.261 106.416 635.591 104.938C636.921 103.461 638.547 102.279 640.468 101.54C642.389 100.654 644.605 100.358 647.117 100.358C649.481 100.358 651.55 100.802 653.323 101.54C655.097 102.279 656.722 103.461 658.2 104.791L656.131 106.859Z" fill="#A0B128"/>
+<path d="M668.543 117.053C668.691 118.678 668.987 120.155 669.43 121.337C669.873 122.519 670.464 123.553 671.203 124.292C671.942 125.031 672.829 125.622 673.863 126.065C674.897 126.508 676.08 126.656 677.262 126.656C678.444 126.656 679.626 126.508 680.513 126.213C681.399 125.917 682.138 125.622 682.877 125.179C683.616 124.735 684.207 124.44 684.65 124.144C685.093 123.849 685.685 123.701 686.128 123.701C686.719 123.701 687.31 123.997 687.605 124.44L689.822 127.247C688.935 128.281 688.049 129.02 687.014 129.758C685.98 130.497 684.798 130.94 683.764 131.383C682.581 131.827 681.399 132.122 680.217 132.27C679.035 132.418 677.853 132.565 676.818 132.565C674.602 132.565 672.533 132.27 670.612 131.531C668.691 130.793 667.066 129.758 665.588 128.281C664.11 126.804 663.076 125.031 662.337 122.962C661.598 120.894 661.155 118.383 661.155 115.576C661.155 113.36 661.451 111.291 662.189 109.518C662.928 107.598 663.963 105.973 665.145 104.495C666.475 103.018 668.1 101.984 670.021 101.097C671.942 100.211 674.011 99.9155 676.375 99.9155C678.444 99.9155 680.217 100.211 681.99 100.95C683.616 101.541 685.093 102.575 686.423 103.757C687.753 104.939 688.64 106.564 689.231 108.337C689.822 110.109 690.265 112.178 690.265 114.394C690.265 115.576 690.118 116.314 689.822 116.758C689.526 117.201 689.083 117.348 688.344 117.348H668.543V117.053ZM683.172 112.473C683.172 111.439 683.025 110.553 682.729 109.666C682.434 108.78 681.99 108.041 681.399 107.302C680.808 106.564 680.069 106.12 679.331 105.677C678.592 105.234 677.41 105.086 676.375 105.086C674.159 105.086 672.385 105.677 671.203 107.007C669.873 108.337 669.135 110.109 668.839 112.325H683.172V112.473Z" fill="#A0B128"/>
+</svg>

package/theme/site/extras/custom.overrides

@@ -18,4 +18,5 @@
 @import 'modal';
 @import 'ccl-tabs';
 @import 'meeting';
-@import 'downloadable-files-table-widget';
+@import 'downloadable-files-table-widget';
+@import 'video';

package/theme/site/extras/video.less

@@ -0,0 +1,19 @@
+@media (min-width: 992px) {
+    .block.video.align.left  .privacy-protection-wrapper{
+        width:50% !important;
+        float:left !important;
+        margin-right:1rem;
+        .video-inner {
+            width: 100% !important;
+
+        }
+    }
+    .block.video.align.right  .privacy-protection-wrapper{
+        width:50% !important;
+        float:right !important;
+        margin-left:1rem;
+        .video-inner {
+            width: 100% !important;
+        }
+    }
+}