@eeacms/volto-clms-theme 1.1.65 → 1.1.67

package/CHANGELOG.md

@@ -4,11 +4,20 @@ 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.65](https://github.com/eea/volto-clms-theme/compare/1.1.64...1.1.65) - 19 October 2023
+### [1.1.67](https://github.com/eea/volto-clms-theme/compare/1.1.66...1.1.67) - 23 October 2023
 
-#### :bug: Bug Fixes
+#### :hammer_and_wrench: Others
+
+- use land.copernicus.eu tag [Mikel Larreategi - [`7929a3c`](https://github.com/eea/volto-clms-theme/commit/7929a3c3cc24a0901c64d82427ab4b48622fbdef)]
+- styling of floating videos [Mikel Larreategi - [`06703b8`](https://github.com/eea/volto-clms-theme/commit/06703b856f2d1922de2b899e3b9f27b62b6f3803)]
+- style the ul-li items not to hide the bullet points behing floating images [Mikel Larreategi - [`abfa4a8`](https://github.com/eea/volto-clms-theme/commit/abfa4a8b2dc175a012b74f95a4c70280ce6bdf0a)]
+- lint [Mikel Larreategi - [`caad34d`](https://github.com/eea/volto-clms-theme/commit/caad34d662171ed6c965ef0032fa1e7c45d2497c)]
+### [1.1.66](https://github.com/eea/volto-clms-theme/compare/1.1.65...1.1.66) - 23 October 2023
 
-- fix: force open also the first accordion of a subtab in the FAQ block [Ion Lizarazu - [`42f73da`](https://github.com/eea/volto-clms-theme/commit/42f73dac1794df5622f82a75978ceea2ecccdd3e)]
+#### :hammer_and_wrench: Others
+
+- eslint [Mikel Larreategi - [`e4e4b0f`](https://github.com/eea/volto-clms-theme/commit/e4e4b0fafe9115071863e403d93065e54d1df0f4)]
+### [1.1.65](https://github.com/eea/volto-clms-theme/compare/1.1.64...1.1.65) - 19 October 2023
 
 ### [1.1.64](https://github.com/eea/volto-clms-theme/compare/1.1.63...1.1.64) - 19 October 2023
 

package/Jenkinsfile

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/CLMSTechnicalLibraryView/CLMSTechnicalLibraryView.jsx

@@ -0,0 +1,45 @@
+import React from 'react';
+import CclButton from '../CclButton/CclButton';
+
+const CLMSTechnicalLibraryView = (props) => {
+  const { content } = props;
+  return (
+    <div className="ccl-container">
+      <>
+        <h1 className="page-title">{content.title}</h1>
+        {content.description && (
+          <div className="technicallibrary-description">
+            {content.description}
+          </div>
+        )}
+        <div className="technicallibrary-content">
+          {content.ondemand ? (
+            <>
+              <p>
+                You are requesting an on-demand document. Please contact the
+                service desk to obtain it.
+              </p>
+
+              <CclButton to={`/en/contact-service-helpdesk`}>
+                Helpdesk
+              </CclButton>
+            </>
+          ) : (
+            <>
+              <p>You can download the file using this link</p>
+              <CclButton
+                url={`${content['@id']}/@@download/file`}
+                download={true}
+                target="_blank"
+              >
+                Download File
+              </CclButton>
+            </>
+          )}
+        </div>
+      </>
+    </div>
+  );
+};
+
+export default CLMSTechnicalLibraryView;

package/src/components/CclCard/CclCard.jsx

@@ -62,7 +62,11 @@ const DocCard = ({ card, url, showEditor, children }) => {
       <div className="card-doc-header">
         <div className="card-doc-title">
           {card?.['@type'] === 'TechnicalLibrary' ? (
-            <a href={`${card['@id']}/@@download/file`}>{card?.title}</a>
+            card?.ondemand ? (
+              <a href={`${card['@id']}`}>{card?.title}</a>
+            ) : (
+              <a href={`${card['@id']}/@@download/file`}>{card?.title}</a>
+            )
           ) : (
             <Link to={url}>{card?.title}</Link>
           )}

package/src/index.js

@@ -25,6 +25,7 @@ import CLMSWorkOpportunityView from '@eeacms/volto-clms-theme/components/CLMSWor
 import CLMSUseCaseView from './components/CLMSUseCasesView/CLMSUseCasesView';
 import CLMSFAQView from './components/CLMSFAQView/CLMSFAQView';
 import CLMSDataSetAccordionView from './components/CLMSDataSetAccordionView/CLMSDataSetAccordionView';
+import CLMSTechnicalLibraryView from './components/CLMSTechnicalLibraryView/CLMSTechnicalLibraryView';
 
 // WIDGET
 import BoundingWidget from './components/Widgets/BoundingWidget';
@@ -77,6 +78,7 @@ const applyConfig = (config) => {
       FAQ: CLMSFAQView,
       Image: ImageView,
       DataSetAccordion: CLMSDataSetAccordionView,
+      TechnicalLibrary: CLMSTechnicalLibraryView,
     },
   };
   config.blocks = {

package/theme/site/extras/styles.less

@@ -27,18 +27,18 @@ hr {
 }
 
 hr
-+ body:not(.contenttype-lrf:not(.section-cart):not(.section-profile):not(.section-newsletter-notification-subscription):not(.section-newsletter-notification-unsubscription):not(.section-logout))
-main {
+  + body:not(.contenttype-lrf:not(.section-cart):not(.section-profile):not(.section-newsletter-notification-subscription):not(.section-newsletter-notification-unsubscription):not(.section-logout))
+  main {
   margin-bottom: 2rem;
 }
 
 body:not(.contenttype-lrf:not(.section-cart):not(.section-profile):not(.section-newsletter-notification-subscription):not(.section-newsletter-notification-unsubscription):not(.section-logout))
-main:not(.map-main) {
+  main:not(.map-main) {
   min-height: 70vh;
 }
 
 .map-body:not(.contenttype-lrf:not(.section-cart):not(.section-profile):not(.section-newsletter-notification-subscription):not(.section-newsletter-notification-unsubscription):not(.section-logout))
-main {
+  main {
   margin-bottom: 0;
 }
 
@@ -110,7 +110,7 @@ ol > li::marker {
 }
 
 ul > ul {
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 /* Links */
@@ -169,77 +169,77 @@ body.contenttype-lrf:not(.section-cart):not(.profilecart) main .ccl-container {
 }
 
 body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-main
-.ccl-container {
+  main
+  .ccl-container {
   max-width: 100%;
   padding: 0;
 }
 
 body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-main
-.ccl-container
-.cont-w-25 {
+  main
+  .ccl-container
+  .cont-w-25 {
   max-width: 100%;
   flex: 0 0 100%;
 }
 
 body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-main
-.ccl-container
-.cont-w-50 {
+  main
+  .ccl-container
+  .cont-w-50 {
   max-width: 100%;
   flex: 0 0 100%;
 }
 
 body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-main
-.ccl-container
-.cont-w-75 {
+  main
+  .ccl-container
+  .cont-w-75 {
   max-width: 100%;
   flex: 0 0 100%;
 }
 @media (min-width: 576px) {
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container {
+    main
+    .ccl-container {
     max-width: 540px;
   }
 }
 @media (min-width: 768px) {
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container {
+    main
+    .ccl-container {
     max-width: 720px;
   }
 
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container
-  .cont-w-25 {
+    main
+    .ccl-container
+    .cont-w-25 {
     max-width: 30%;
     flex: 0 0 30%;
   }
 
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container
-  .cont-w-50 {
+    main
+    .ccl-container
+    .cont-w-50 {
     max-width: 50%;
     flex: 0 0 50%;
   }
 
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container
-  .cont-w-75 {
+    main
+    .ccl-container
+    .cont-w-75 {
     max-width: 70%;
     flex: 0 0 70%;
   }
 
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container
-  .cont-o-1 {
+    main
+    .ccl-container
+    .cont-o-1 {
     order: 1;
   }
 
@@ -253,30 +253,30 @@ main
 }
 @media (min-width: 992px) {
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container {
+    main
+    .ccl-container {
     max-width: 960px;
   }
 }
 @media (min-width: 1200px) {
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container {
+    main
+    .ccl-container {
     max-width: 1127px;
   }
 
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container
-  .cont-w-25 {
+    main
+    .ccl-container
+    .cont-w-25 {
     max-width: 25%;
     flex: 0 0 25%;
   }
 
   body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
-  main
-  .ccl-container
-  .cont-w-75 {
+    main
+    .ccl-container
+    .cont-w-75 {
     max-width: 75%;
     flex: 0 0 75%;
   }
@@ -489,6 +489,10 @@ main
   margin-top: 2rem;
 }
 
+body.contenttype-document .right-content ul {
+  overflow: hidden;
+}
+
 .card-container {
   display: flex;
   flex-wrap: wrap;

package/theme/site/extras/video.less

@@ -1,23 +1,66 @@
-@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;
+@media (max-width: 992px) {
+  .block.video.align.right .privacy-protection-wrapper,
+  .block.video.align.left .privacy-protection-wrapper {
+    width: 100%;
+    margin-right: 0;
+    margin-left: 0;
+    float: none;
+  }
+  .block.align.left.video .video-inner,
+  .block.align.right.video .video-inner {
+    width: 100%;
+  }
+  .block.align.left.maps iframe,
+  .block.align.left.video .video-inner,
+  .block.align.left img {
+    margin-right: 0 !important;
+    float: none;
+    margin-bottom: 0;
+  }
+  .block.align.right.maps iframe,
+  .block.align.right.video .video-inner,
+  .block.align.right img {
+    margin-left: 0 !important;
+    float: none;
+    margin-bottom: 0;
+  }
+}
 
-        }
-    }
-    .block.video.align.right  .privacy-protection-wrapper{
-        width:50% !important;
-        float:right !important;
-        margin-left:1rem;
-        .video-inner {
-            width: 100% !important;
-        }
+@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.align.right.video .video-inner img {
-        max-width: 100%;
-        margin-left: 0 !important;
+  }
+  .block.video.align.right .privacy-protection-wrapper {
+    width: 50% !important;
+    float: right !important;
+    margin-left: 1rem;
+    .video-inner {
+      width: 100% !important;
     }
+  }
+  .block.align.right.maps iframe,
+  .block.align.right.video .video-inner,
+  .block.align.right img {
+    margin-bottom: 1em;
+    margin-left: 1em !important;
+    float: right;
+  }
+  .block.align.left.maps iframe,
+  .block.align.left.video .video-inner,
+  .block.align.left img {
+    margin-right: 1em !important;
+    margin-bottom: 1em;
+    float: left;
+  }
+  .block.align.right.video .video-inner img,
+  .block.align.left.video .video-inner img {
+    max-width: 100%;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+  }
 }