@eeacms/volto-clms-theme 1.0.91 → 1.0.92

package/CHANGELOG.md

@@ -4,8 +4,21 @@ 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.0.92](https://github.com/eea/volto-clms-theme/compare/1.0.91...1.0.92)
+
+- Ux improvements [`#254`](https://github.com/eea/volto-clms-theme/pull/254)
+- Bugs n improvements [`#252`](https://github.com/eea/volto-clms-theme/pull/252)
+- Zoom tooltip [`3c41e14`](https://github.com/eea/volto-clms-theme/commit/3c41e14e4b631193408adb741c440805ca5cc0df)
+- ESLint fix [`1f3ead1`](https://github.com/eea/volto-clms-theme/commit/1f3ead111747613580ab5e637fc40eae46b39364)
+- Download card icons [`5bc506d`](https://github.com/eea/volto-clms-theme/commit/5bc506d9251068962ff3e3641017f854b37666f3)
+- Card work [`d169ff4`](https://github.com/eea/volto-clms-theme/commit/d169ff40e8d3c2fce56af6aa09677c0ba924407a)
+- UX improvements [`72769b4`](https://github.com/eea/volto-clms-theme/commit/72769b4e0b2327b7c35cec435b2a3311a9ccee3f)
+
 #### [1.0.91](https://github.com/eea/volto-clms-theme/compare/1.0.90...1.0.91)
 
+> 4 April 2022
+
+- add extra information for correct rendering to TechnicalLibraries at … [`#251`](https://github.com/eea/volto-clms-theme/pull/251)
 - add extra information for correct rendering to TechnicalLibraries at DataSet view [`ac8578e`](https://github.com/eea/volto-clms-theme/commit/ac8578eeff8eeb3cff9944394937a52062d7caf1)
 
 #### [1.0.90](https://github.com/eea/volto-clms-theme/compare/1.0.89...1.0.90)

package/Jenkinsfile

@@ -185,10 +185,10 @@ pipeline {
             unstash "xunit-reports"
             unstash "cypress-coverage"
             def scannerHome = tool 'SonarQubeScanner';
-            def nodeJS = tool 'NodeJS11';
+            def nodeJS = tool 'NodeJS';
             withSonarQubeEnv('Sonarqube') {
               sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
-              sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+              sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
               sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
           }

package/package.json

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

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingWorkOpportunities.jsx

@@ -30,9 +30,11 @@ const CclWorkOpportunity = (props) => {
           <br />
         </>
       )}
-      <div className="card-work-number">
-        <span className="card-work-number-title">
-          <h2>{item.title}</h2>
+      <div class="card-work-line">
+        <h2>{item.title}</h2>
+      </div>
+      <div className="card-work-line">
+        <span className="card-work-title">
           {item['@type'] === 'WorkOpportunity'
             ? intl.formatMessage(messages.ReferenceNo)
             : intl.formatMessage(messages.ProcurementNo)}
@@ -43,11 +45,11 @@ const CclWorkOpportunity = (props) => {
           item.procurement_no
         )}
       </div>
-      <div className="card-work-title">
+      <div className="card-work-line">
         <p>{item.description}</p>
       </div>
-      <div className="work-opportunities-deadline">
-        <span className="card-work-deadline-title">
+      <div className="card-work-line">
+        <span className="card-work-title">
           {intl.formatMessage(messages.SubmissionDeadline)}
         </span>
         {new Date(item.submission_deadline).toLocaleString()}

package/src/components/CLMSDownloadsView/FileCard.jsx

@@ -11,8 +11,9 @@ import { defineMessages, useIntl } from 'react-intl';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Icon } from '@plone/volto/components';
 import React from 'react';
-import alertSVG from '@plone/volto/icons/alert.svg';
+import pauseSVG from '@plone/volto/icons/pause.svg';
 import errorSVG from '@plone/volto/icons/error.svg';
+import warningSVG from '@plone/volto/icons/warning.svg';
 import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
 import packSVG from '@plone/volto/icons/pack.svg';
 import removeSVG from '@plone/volto/icons/delete.svg';
@@ -74,7 +75,21 @@ const FileCard = (props) => {
         {/* {10 - daysDiff > -1 && ( */}
         <Grid.Row>
           <Grid.Column verticalAlign="middle" textAlign="center" width={2}>
-            {['In_progress', 'Queued'].includes(item?.Status) && (
+            {item?.Status === 'Queued' && (
+              <Popup
+                content="Queued"
+                size="small"
+                trigger={
+                  <Icon
+                    name={pauseSVG}
+                    size={50}
+                    color="#a0b128"
+                    title={'Queued'}
+                  />
+                }
+              />
+            )}
+            {item?.Status === 'In_progress' && (
               <Popup
                 content="Preparing download files"
                 size="small"
@@ -103,7 +118,7 @@ const FileCard = (props) => {
                   <Icon
                     name={blockSVG}
                     size={50}
-                    color="#90956e"
+                    color="#a0b128"
                     title={'Cancelled'}
                   />
                 }
@@ -115,9 +130,9 @@ const FileCard = (props) => {
                 size="small"
                 trigger={
                   <Icon
-                    name={errorSVG}
+                    name={warningSVG}
                     size={50}
-                    color="#e40166"
+                    color="#faa73e"
                     title={'Finished with errors'}
                   />
                 }
@@ -129,7 +144,7 @@ const FileCard = (props) => {
                 size="small"
                 trigger={
                   <Icon
-                    name={alertSVG}
+                    name={errorSVG}
                     size={50}
                     color="#e40166"
                     title={'Rejected download'}

package/src/components/CclCard/cards.less

@@ -336,6 +336,11 @@
   font-size: 1rem;
 }
 
+.card-event svg {
+  width: 1rem;
+  margin-right: 0.5rem;
+}
+
 /* Documents */
 .card-doc {
   padding: 1rem;
@@ -381,37 +386,15 @@
   margin-bottom: 1rem;
 }
 
-.card-work-number {
+.card-work-line:not(:last-of-type) {
   margin-bottom: 1rem;
 }
 
-.card-work-number-title,
-.card-work-deadline-title {
+.card-work-title {
   margin-right: 0.25rem;
   font-weight: bold;
 }
 
-/* Work opportunities */
-.card-work {
-  padding: 2rem;
-  background: #a0b1280f;
-}
-
-.card-work:not(:last-of-type) {
-  margin-bottom: 1rem;
-}
-
-.card-work-number {
-  margin-bottom: 1rem;
-}
-
-.card-work-number-title,
-.card-work-deadline-title {
-  margin-right: 0.25rem;
-  font-weight: bold;
-}
-
-.card-event svg {
-  width: 1rem;
-  margin-right: 0.5rem;
+.card-work-line h2 {
+  margin-top: 0 !important;
 }

package/src/components/CclLoginModal/CclLoginModal.jsx

@@ -35,12 +35,12 @@ function CclLoginModal() {
   return (
     <CclModal
       trigger={
-        <div className="header-login-link">
+        <span className="header-login-link">
           <FormattedMessage
             id="loginRegister"
             defaultMessage="Register/Login"
           />
-        </div>
+        </span>
       }
       size="tiny"
       modalStatus={modalStatus}

package/theme/clms/css/forms.css

@@ -32,10 +32,19 @@
 }
 
 .ccl-button[disabled] {
-  border-color: #adb0b8;
-  color: #adb0b8;
+  border-color: #a0b128;
+  color: #a0b128;
+  cursor: not-allowed;
+  opacity: 0.3;
+  pointer-events: none;
+}
+
+.ccl-button.ccl-button-green[disabled] {
+  border-color: #a0b128;
+  background-color: #a0b128;
+  color: white;
   cursor: not-allowed;
-  opacity: 0.5;
+  opacity: 0.3;
   pointer-events: none;
 }
 

package/theme/clms/css/maps.css

@@ -34,6 +34,7 @@
 	height: 36px;
 	border: none !important;
 	background-color: #a0b128cc;
+	overflow: visible;
 	box-shadow: none !important;
 	color: white;
 	font-size: 18px;
@@ -55,16 +56,15 @@
 	cursor: auto;
 }
 
+.esri-widget--button.active-widget {
+	background: #212529;
+}
+
 .land .basemap-container {
 	display: flex;
 	box-shadow: none !important;
 }
 
-.land .esri-basemap-gallery {
-	display: none;
-	margin: 0 !important;
-}
-
 .land .esri-basemap-gallery__item:first-child {
 	margin-top: 0;
 }
@@ -96,10 +96,6 @@
 	flex-direction: column;
 }
 
-.land .measurement-panel {
-	display: none;
-}
-
 .land .measurement-buttons {
 	display: flex;
 	justify-content: space-evenly;
@@ -153,10 +149,6 @@
 	box-shadow: none !important;
 }
 
-.land .esri-print {
-	display: none;
-}
-
 .land .esri-print__layout-tab {
 	font-size: 1rem;
 }
@@ -179,13 +171,6 @@
 	box-shadow: none !important;
 }
 
-.land .area-panel {
-	display: none;
-	padding: 1rem;
-	background-color: white;
-	font-size: 1rem;
-}
-
 .land .area-panel .ccl-form-group:not(:first-of-type) {
 	margin-top: 0.5rem;
 }
@@ -522,10 +507,6 @@
 	margin-top: 0.5rem;
 }
 
-.land .legend-panel {
-	display: none;
-}
-
 .land .legend-container {
 	display: flex;
 	box-shadow: none !important;

package/theme/clms/css/maps.less

@@ -36,6 +36,7 @@
     height: 36px;
     border: none !important;
     background-color: #a0b128cc;
+    overflow: visible;
     box-shadow: none !important;
     color: white;
     font-size: 18px;
@@ -57,17 +58,16 @@
     cursor: auto;
   }
 
+  .esri-widget--button.active-widget {
+    background: #212529;
+  }
+
   /* Basemap */
   .basemap-container {
     display: flex;
     box-shadow: none !important;
   }
 
-  .esri-basemap-gallery {
-    display: none;
-    margin: 0 !important;
-  }
-
   .esri-basemap-gallery__item:first-child {
     margin-top: 0;
   }
@@ -107,10 +107,6 @@
     flex-direction: column;
   }
 
-  .measurement-panel {
-    display: none;
-  }
-
   .measurement-buttons {
     display: flex;
     justify-content: space-evenly;
@@ -165,10 +161,6 @@
     box-shadow: none !important;
   }
 
-  .esri-print {
-    display: none;
-  }
-
   .esri-print__layout-tab {
     font-size: 1rem;
   }
@@ -192,13 +184,6 @@
     box-shadow: none !important;
   }
 
-  .area-panel {
-    display: none;
-    padding: 1rem;
-    background-color: white;
-    font-size: 1rem;
-  }
-
   .area-panel .ccl-form-group:not(:first-of-type) {
     margin-top: 0.5rem;
   }
@@ -286,10 +271,12 @@
     height: 440px;
     padding: 0;
     background: #ffffff;
+    overflow-x: hidden;
     overflow-y: auto;
   }
 
   .map-menu .panel {
+    position: relative;
     display: none;
     animation: fadein 0.8s;
   }
@@ -404,7 +391,7 @@
   .map-menu-dataset > div:first-of-type {
     display: flex;
     width: 100%;
-    justify-content: flex-start;
+    justify-content: space-between;
   }
 
   .map-menu-layers-container {
@@ -419,7 +406,7 @@
   }
 
   .map-menu-icon {
-    margin-left: 0.5rem;
+    margin-left: 1rem;
     color: #a0b128;
     cursor: pointer;
     font-size: 1rem;
@@ -539,10 +526,6 @@
   }
 
   /* Legend*/
-  .legend-panel {
-    display: none;
-  }
-
   .legend-container {
     display: flex;
     box-shadow: none !important;

package/theme/clms/css/menu.css

@@ -410,7 +410,6 @@
   display: flex;
   justify-content: flex-end;
   overflow: auto;
-  background-color: rgba(33,37,41,.5019607843137255);
 }
 
 .modal-filters-container {