@eeacms/volto-clms-theme 1.0.119 → 1.0.120

package/CHANGELOG.md

@@ -4,6 +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.0.120](https://github.com/eea/volto-clms-theme/compare/1.0.119...1.0.120) - 2 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: use plain a for EU Login URL [Mikel Larreategi - [`e8d2d66`](https://github.com/eea/volto-clms-theme/commit/e8d2d664e750df517a8d955c4833a70e0f8b34e3)]
+
+#### :hammer_and_wrench: Others
+
+- Map login button fix [rodriama - [`0e7e520`](https://github.com/eea/volto-clms-theme/commit/0e7e520ac2515846b4af6e782a9f4cdc2375a467)]
+- Card doc fix [rodriama - [`556e33c`](https://github.com/eea/volto-clms-theme/commit/556e33c833b9980edab3b778fc408e662fd5fffd)]
+- ESLint fix [rodriama - [`d55db81`](https://github.com/eea/volto-clms-theme/commit/d55db818a02be4ccfcc524c1f03005600644a9e4)]
+- Credits pop up fix [rodriama - [`3772c16`](https://github.com/eea/volto-clms-theme/commit/3772c163a0a998a7dc7b0fddd176346f2d56a4e1)]
+- ESLint fix [rodriama - [`08a9bd8`](https://github.com/eea/volto-clms-theme/commit/08a9bd8c3cc78d928df58cc8b66fa3aea81f2b13)]
+- Event detail segment [rodriama - [`524e3ff`](https://github.com/eea/volto-clms-theme/commit/524e3fff130ae53ffb09aa534d120677e5fd1c1a)]
 ### [1.0.119](https://github.com/eea/volto-clms-theme/compare/1.0.118...1.0.119) - 1 September 2022
 
 #### :bug: Bug Fixes

package/package.json

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

package/src/components/Blocks/CclHomeBgImageBlock/CclGreenBgView.jsx

@@ -69,6 +69,8 @@ const CclGreenBgView = (props) => {
                 <a
                   className="ccl-banner-info-link"
                   href={'' + data?.locationHref?.[0]?.['@id']}
+                  target="_blank"
+                  rel="noreferrer"
                 >
                   More info
                 </a>

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/custom.less

@@ -32,6 +32,7 @@ div.tabs-block.CCLCarousel {
 .text-link-carousel-block {
   height: 2rem;
   padding: 0;
+  margin-left: 0.5rem;
 }
 
 .text-link-carousel-block-content {

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -77,6 +77,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
                   key={item.id}
                   loading={geonetwork_importation.loading}
                   circular
+                  style={{ width: '50%' }}
                 >
                   <strong>
                     {item.title} (from {item.type}):{' '}
@@ -203,6 +204,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
             key={'wms-layers-import'}
             loading={wms_layers_importation?.loading}
             circular
+            style={{ width: '50%' }}
           >
             <Modal
               onClose={() => {
@@ -288,17 +290,13 @@ const CLMSDatasetDetailView = ({ content, token }) => {
               </p>
             )}
           </Segment>
-        </Segment.Group>
-      )}
-
-      {user?.roles && user.roles.includes('Manager') && (
-        <Segment.Group compact horizontal>
           <Segment
             padded={'very'}
             color={'olive'}
             key={'wms-fields-import'}
             loading={wms_fields_importation?.loading}
             circular
+            style={{ width: '50%' }}
           >
             <Modal
               onClose={() => {

package/src/components/CLMSMeetingView/CLMSMeetingView.jsx

@@ -288,7 +288,13 @@ export const CLMSMeetingView = (props) => {
           </Segment.Group>
         )}
       {content.description}
-      <Segment compact padded={'very'} color={'olive'} floated="left">
+      <Segment
+        compact
+        padded={'small'}
+        color={'olive'}
+        floated="right"
+        style={{ marginRight: 0 }}
+      >
         <div className="dataset-info-field">
           <div className="dataset-field-title">
             <Header>{intl.formatMessage(messages.when)}</Header>

package/src/components/CclCard/CclCard.jsx

@@ -49,30 +49,30 @@ const CardLink = ({ url, children, className, condition = true }) => {
 const DocCard = ({ card, url, showEditor, children }) => {
   return (
     <>
-      <div className="card-doc-title">
-        {card?.Type === 'TechnicalLibrary' ? (
-          <a href={`${card['@id']}/@@download/file`}>{card?.title}</a>
-        ) : (
-          <Link to={url}>{card?.title}</Link>
-        )}
-        {card?.Type === 'TechnicalLibrary' && showEditor && (
-          <Link to={`${url}/edit`}>
-            <Icon
-              name={penSVG}
-              size="15px"
-              className="circled"
-              title={'Edit'}
-            />
-          </Link>
-        )}
-      </div>
-      <div className="card-doc-text">
-        <div className="doc-description">{card?.description}</div>
+      <div className="card-doc-header">
+        <div className="card-doc-title">
+          {card?.Type === 'TechnicalLibrary' ? (
+            <a href={`${card['@id']}/@@download/file`}>{card?.title}</a>
+          ) : (
+            <Link to={url}>{card?.title}</Link>
+          )}
+          {card?.Type === 'TechnicalLibrary' && showEditor && (
+            <Link to={`${url}/edit`}>
+              <Icon
+                name={penSVG}
+                size="15px"
+                className="circled"
+                title={'Edit'}
+              />
+            </Link>
+          )}
+        </div>
         {card?.Type === 'TechnicalLibrary' && (
           <div className="card-doc-size">{card.getObjSize || ''}</div>
         )}
-        {children}
       </div>
+      <div className="card-doc-description">{card?.description}</div>
+      {children}
     </>
   );
 };

package/src/components/CclCard/cards.less

@@ -375,13 +375,9 @@
   border-bottom: solid 1px #a0b12833;
 }
 
-/* Documents */
-.card-doc {
-  padding: 1rem;
-}
-
-.card-doc:not(:last-of-type) {
-  border-bottom: solid 1px #a0b12833;
+.card-doc-header {
+  display: flex;
+  justify-content: space-between;
 }
 
 .card-doc-title {
@@ -391,11 +387,6 @@
   font-weight: bold;
 }
 
-.card-doc-text {
-  display: flex;
-  justify-content: space-between;
-}
-
 .card-doc-size {
   margin-left: 1rem;
   white-space: nowrap;

package/src/components/CclLoginModal/CclLoginModal.jsx

@@ -90,12 +90,9 @@ function CclLoginModal(props) {
       </div>
       <div className="actions">
         <div className="modal-buttons">
-          <UniversalLink
-            href={loginUrl || '#'}
-            className="ccl-button ccl-button-green"
-          >
+          <a href={loginUrl || '#'} className="ccl-button ccl-button-green">
             Login using EU Login
-          </UniversalLink>
+          </a>
         </div>
       </div>
     </CclModal>

package/theme/clms/css/carousel.css

@@ -496,7 +496,7 @@
 .ccl-banner-info {
   position: absolute;
   z-index: 1;
-  right: 0;
+  right: 2rem;
   bottom: 2rem;
   display: none;
   width: 100%;
@@ -524,9 +524,7 @@
 }
 
 .ccl-banner-info-link {
-  display: inline-block;
-  width: 100%;
-  text-align: right;
+  float: right;
 }
 
 .tabs-block > .styled {

package/theme/clms/css/home.css

@@ -68,7 +68,6 @@
 
 .ccl-banner-top-bar {
   height: 2rem;
-  padding: 0 1rem;
   border-top: 1px solid #6c6e73;
   border-bottom: 1px solid #6c6e73;
   background-color: #a0b128;
@@ -91,13 +90,13 @@
 }
 
 .ccl-banner-top-bar .ccl-container .ccl-banner-top-bar-right {
-  margin-left: 0.5rem;
   cursor: pointer;
 }
 
 .ccl-banner-top-bar .ccl-container {
   display: flex;
   height: 100%;
+  padding: 0 2rem;
   align-items: center;
   justify-content: space-between;
 }

package/theme/clms/css/maps.less

@@ -583,7 +583,14 @@
     margin: 0;
     background: none;
     float: none;
-    font-size: 0.85rem;
+  }
+
+  .login-panel .login-text {
+    margin-bottom: 1rem;
+  }
+
+  .login-panel .login-block .ccl-button {
+    margin: 0;
   }
 
   #login_close {