Added tooltips

eea · Dec 17, 2020 · afa335b · afa335b
1 parent 78af983
commit afa335b
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 47 deletions.
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,2 +1 @@
 User-agent: *
-
diff --git a/src/components/manage/Blocks/SiteBlocks/CompetentAuthority.jsx b/src/components/manage/Blocks/SiteBlocks/CompetentAuthority.jsx
@@ -16,7 +16,12 @@ const CompetentAuthority = (props) => {
         )}
       >
         <h3 className="blue">Competent Authority</h3>
-        <span className="floating-icon" data-tip={'This is a tooltip'}>
+        <span
+          className="floating-icon"
+          data-tip={
+            'Authority, body or bodies responsible for regulating the facility and reporting the associated E-PRTR data, as designated by the reporting country'
+          }
+        >
           <Icon
             className="firefox-icon"
             name={infoSVG}

diff --git a/src/components/manage/Blocks/SiteBlocks/Header/Edit.jsx b/src/components/manage/Blocks/SiteBlocks/Header/Edit.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
@@ -11,7 +11,7 @@ const getSchema = (props) => {
 };
 
 const Edit = (props) => {
-  const [state, setState] = useState({
+  const [state] = useState({
     schema: getSchema({ ...props, providerUrl: settings.providerUrl }),
     id: _uniqueId('block_'),
   });

diff --git a/src/components/manage/Blocks/SiteBlocks/Header/View.jsx b/src/components/manage/Blocks/SiteBlocks/Header/View.jsx
@@ -1,10 +1,12 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { Tab, Dropdown, Table } from 'semantic-ui-react';
+import { Dropdown } from 'semantic-ui-react';
 import QueryBuilder from '../QueryBuilder';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
-import cx from 'classnames';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import './style.css';
 
 const View = (props) => {

diff --git a/src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx
@@ -3,19 +3,15 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
 import { Link } from 'react-router-dom';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
-import Icon from '@plone/volto/components/theme/Icon/Icon';
-import infoSVG from '@plone/volto/icons/info.svg';
-import CompetentAuthority from '../CompetentAuthority';
-import { getDate } from '../helpers';
-import cx from 'classnames';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import './style.css';
 
 const View = (props) => {
   const {
     siteInspireId = null,
-    facilityInspireId = null,
-    installationInspireId = null,
     lcpInspireId = null,
     siteReportingYear = null,
   } = props.discodata_query.search;

diff --git a/src/components/manage/Blocks/SiteBlocks/PermitingAuthority.jsx b/src/components/manage/Blocks/SiteBlocks/PermitingAuthority.jsx
@@ -11,7 +11,12 @@ const PermitingAuthority = (props) => {
     <div>
       <div className={cx('header-tooltip', 'mb-1')}>
         <h3 className="blue">Permiting Authority</h3>
-        <span className="floating-icon" data-tip={'This is a tooltip'}>
+        <span
+          className="floating-icon"
+          data-tip={
+            'Authority, body or bodies responsible for issuing a permit to a given facility'
+          }
+        >
           <Icon
             className="firefox-icon"
             name={infoSVG}

diff --git a/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx
@@ -2,7 +2,10 @@ import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import CompetentAuthority from '../CompetentAuthority';
@@ -59,7 +62,7 @@ const View = (props) => {
                   {facility[0]?.facilityIndustrialActivity}{' '}
                   {facility[0]?.facilityMainActivity}
                 </span>
-                <span
+                {/* <span
                   className="floating-icon"
                   data-tip={'This is a tooltip 2'}
                 >
@@ -69,7 +72,7 @@ const View = (props) => {
                     size="20"
                     color="#D63D27"
                   />
-                </span>
+                </span> */}
               </p>
             </div>
           ) : (

diff --git a/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx
@@ -3,7 +3,10 @@ import { useHistory } from 'react-router-dom';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import _uniqueId from 'lodash/uniqueId';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import CompetentAuthority from '../CompetentAuthority';
@@ -62,9 +65,10 @@ const View = (props) => {
                     site.eprtrReportingYear
                       ? 'xs-6 sm-6 md-6 lg-6'
                       : 'xs-12 sm-12 md-12 lg-12',
+                    'mb-0',
                   )}
                 >
-                  <span
+                  {/* <span
                     className="floating-icon"
                     data-tip={'This is a tooltip'}
                   >
@@ -74,14 +78,18 @@ const View = (props) => {
                       size="20"
                       color="#fff"
                     />
-                  </span>
+                  </span> */}
                   <p className="lighter mb-0">Last report was submitted on:</p>
-                  <p className="bold">{getDate(site.authLastUpdated)}</p>
+                  <p className="bold" style={{ marginBottom: '0' }}>
+                    {getDate(site.authLastUpdated)}
+                  </p>
                 </div>
                 {site.eprtrReportingYear ? (
                   <div className="xs-6 sm-6 md-6 lg-6">
                     <p className="lighter mb-0">EPRTR reporting year</p>
-                    <p className="bold">{site.eprtrReportingYear}</p>
+                    <p className="bold" style={{ marginBottom: '0' }}>
+                      {site.eprtrReportingYear}
+                    </p>
                   </div>
                 ) : (
                   ''

diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx
@@ -1,21 +1,19 @@
-import React, { useState, useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
+import React, { useState } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
-import _uniqueId from 'lodash/uniqueId';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
-import RenderTable from '../RenderTable';
 import PermitingAuthority from '../PermitingAuthority';
-import moment from 'moment';
 import cx from 'classnames';
-import { getDate, getLonLat } from '../helpers';
+import { getDate } from '../helpers';
 import infoSVG from '@plone/volto/icons/info.svg';
 import './style.css';
 
 const View = (props) => {
-  const history = useHistory();
   const [aels, setAels] = useState(false);
   const {
     siteInspireId = null,
@@ -79,7 +77,12 @@ const View = (props) => {
           {/* BAT CONCLUSION */}
           <div className={cx('header-tooltip', 'mb-1')}>
             <h3 className="blue">BAT conclusions</h3>
-            <span className="floating-icon" data-tip={'This is a tooltip'}>
+            <span
+              className="floating-icon"
+              data-tip={
+                'Number of individual conclusions that indicate which techniques or combinations of techniques are BAT for achieving a specific environmental objective'
+              }
+            >
               <Icon
                 className="firefox-icon"
                 name={infoSVG}

diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/Edit.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/Edit.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
@@ -11,7 +11,7 @@ const getSchema = (props) => {
 };
 
 const Edit = (props) => {
-  const [state, setState] = useState({
+  const [state] = useState({
     schema: getSchema({ ...props, providerUrl: settings.providerUrl }),
     id: _uniqueId('block_'),
   });

diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx
@@ -1,21 +1,19 @@
-import React, { useState, useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
+import React, { useState } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
-import _uniqueId from 'lodash/uniqueId';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
-import RenderTable from '../RenderTable';
 import PermitingAuthority from '../PermitingAuthority';
-import moment from 'moment';
 import cx from 'classnames';
-import { getDate, getLonLat } from '../helpers';
+import { getDate } from '../helpers';
 import infoSVG from '@plone/volto/icons/info.svg';
 import './style.css';
 
 const View = (props) => {
-  const history = useHistory();
   const [aels, setAels] = useState(false);
   const {
     siteInspireId = null,
@@ -67,7 +65,12 @@ const View = (props) => {
           {/* ABOUT THE ENTITY */}
           <div className={cx('header-tooltip', 'mb-1')}>
             <h3 className="blue">About the entity</h3>
-            <span className="floating-icon" data-tip={'This is a tooltip'}>
+            <span
+              className="floating-icon"
+              data-tip={
+                'Information regarding the facilities included in the industrial site'
+              }
+            >
               <Icon
                 className="firefox-icon"
                 name={infoSVG}
@@ -97,7 +100,12 @@ const View = (props) => {
           {/* BAT CONCLUSION */}
           <div className={cx('header-tooltip', 'mb-1')}>
             <h3 className="blue">BAT conclusions</h3>
-            <span className="floating-icon" data-tip={'This is a tooltip'}>
+            <span
+              className="floating-icon"
+              data-tip={
+                'Number of individual conclusions that indicate which techniques or combinations of techniques are BAT for achieving a specific environmental objective'
+              }
+            >
               <Icon
                 className="firefox-icon"
                 name={infoSVG}

diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides
@@ -1636,7 +1636,9 @@ b {
   border-radius: 10px;
   p {
     color: #fff;
-    margin-bottom: 0.5em !important;
+    &:not(:last-child) {
+      margin-bottom: 0.5em !important;
+    }
   }
   .floating-icon {
     position: absolute;