design-comuni-plone-theme 10.6.2 → 10.6.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## [10.6.3](https://github.com/redturtle/design-comuni-plone-theme/compare/v10.6.2...v10.6.3) (2023-12-15)
+
+
+### Bug Fixes
+
+* different styles and ui for all Search block listing templates when compared to default Listing template ([#437](https://github.com/redturtle/design-comuni-plone-theme/issues/437)) ([d6cf41d](https://github.com/redturtle/design-comuni-plone-theme/commit/d6cf41dd63e6d1b891ff045238d5d7d9d9df5ff0))
+* gdpr privacy conditional embed to work in diff view ([#438](https://github.com/redturtle/design-comuni-plone-theme/issues/438)) ([6a8c361](https://github.com/redturtle/design-comuni-plone-theme/commit/6a8c361feda654f0301b5026533234438469ff37))
+
+
+### Documentation
+
+* aggiornamento della lista dei comuni in publiccode.yml ([#159](https://github.com/redturtle/design-comuni-plone-theme/issues/159)) ([7e87e9f](https://github.com/redturtle/design-comuni-plone-theme/commit/7e87e9f2071adeced38eae57eb8d09cee6433fa1))
+* updated publiccode and release log ([f27a61a](https://github.com/redturtle/design-comuni-plone-theme/commit/f27a61aef3f41ac34bcbdf9e58e2a6ae0166d0f9))
+
 ## [10.6.2](https://github.com/redturtle/design-comuni-plone-theme/compare/v10.6.1...v10.6.2) (2023-12-14)
 
 

package/RELEASE.md

@@ -41,6 +41,12 @@
 - ...
 -->
 
+## Versione 10.6.3 (15/12/2023)
+
+### Fix
+
+- Sistemati alcuni problemi di visualizzazione nei template disponibili per il blocco Cerca. Ora tutti i template disponibili per questo blocco rispecchiano graficamente quelli per il blocco Elenco sia in visualizzazione che in modifica.
+
 ## Versione 10.6.2 (14/12/2023)
 
 ### Fix

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "10.6.2",
+  "version": "10.6.3",
   "main": "src/index.js",
   "keywords": [
     "volto-addon",
@@ -146,7 +146,7 @@
     "volto-editablefooter": "5.0.1",
     "volto-feedback": "0.1.5",
     "volto-form-block": "3.1.0",
-    "volto-gdpr-privacy": "2.1.0",
+    "volto-gdpr-privacy": "2.1.1",
     "volto-google-analytics": "2.0.0",
     "volto-multilingual-widget": "3.0.0",
     "volto-querywidget-with-browser": "0.4.0",

package/publiccode.yml

@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2023-12-14'
+releaseDate: '2023-12-15'
 softwareType: standalone/web
-softwareVersion: 10.6.2
+softwareVersion: 10.6.3
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord
@@ -252,14 +252,21 @@ usedBy:
   - Comune di Concordia sul Secchia
   - Comune di Gattatico
   - Comune di Finale Emilia
+  - Comune di Fiorano Modenese
+  - Comune di Formigine
+  - Comune di Frassinoro
   - Comune di Imola
+  - Comune di Maranello
   - Comune di Medolla
   - Comune di Mirandola
   - Comune di Modena
   - Comune di Montecchio Emilia
+  - Comune di Montefiorino
   - Comune di Novellara
+  - Comune di Palagano
   - Comune di Parma
   - Comune di Piacenza
+  - Comune di Prignano
   - Comune di Reggio Emilia
   - Comune di San Felice sul Panaro
   - Comune di San Lazzaro di Savena
@@ -267,6 +274,7 @@ usedBy:
   - Comune di San Possidonio
   - Comune di San Prospero
   - Comune di Santilario d'Enza
+  - Comune di Sassuolo
   - Comune di Toscolano Maderno
   - Comune di Vaiano
   - Comune di Vernio
@@ -275,6 +283,7 @@ usedBy:
   - Nuovo Circondario Imolese
   - Ospedali Galliera - Bilancio Sociale
   - Provincia di Pisa
+  - Unione Comuni Distretto Ceramico
   - UCMAN (Unione dei Comuni Modenesi Area Nord)
   - Unione Val d'Enza
   - Unione Val di Bisenzio

package/src/customizations/volto/components/manage/Blocks/Search/SearchBlockView.jsx

@@ -1,5 +1,7 @@
 /* CUSTOMIZATIONS:
   - Agid styling
+  - Add class .block.listing in listing body container div to use
+    existing listing template styles
 */
 
 import React from 'react';
@@ -99,7 +101,8 @@ const SearchBlockView = (props) => {
         selectedView={selectedView}
         setSelectedView={setSelectedView}
       >
-        <div className="search-results">
+        {/* Add class .block.listing to benefit from existing listing template styles */}
+        <div className="block listing search-results">
           <ListingBody
             variation={{ ...data, ...listingBodyVariation }}
             data={listingBodyData}

package/src/theme/ItaliaTheme/Blocks/_bandiInEvidenceTemplate.scss

@@ -56,8 +56,8 @@
 
   // tablet
   .bandi-in-evidence-cards-wrapper {
-    @media (min-width: #{map-get($grid-breakpoints, md)}) and  (max-width: #{map-get($grid-breakpoints, xxl)}) {
-      grid-template-columns: auto auto;
+    @media (min-width: #{map-get($grid-breakpoints, md)}) and  (max-width: #{map-get($grid-breakpoints, xl)}) {
+      grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
     }
 
     @media (min-width: #{map-get($grid-breakpoints, md)}) and (max-width: #{map-get($grid-breakpoints, lg)}) {

package/src/theme/ItaliaTheme/Blocks/_search.scss

@@ -151,15 +151,13 @@
         border-color: hsl(210deg, 17.6470588235%, 43.35%) !important;
         border-bottom: 1px solid;
         font-size: 1rem;
-        transition:
-          border-color 0.3s ease-in,
+        transition: border-color 0.3s ease-in,
           background-color 0.2s cubic-bezier(0, 1, 0, 1) 0.2s;
 
         &[aria-expanded='true'] {
           border-color: transparent !important;
           box-shadow: 0 1rem 2rem -0.25rem rgba(0, 0, 0, 0.15) !important;
-          transition:
-            background-color 0.2s cubic-bezier(0, 1, 0, 1),
+          transition: background-color 0.2s cubic-bezier(0, 1, 0, 1),
             border-color 0.05s cubic-bezier(1, 0, 1, 0);
         }
 
@@ -246,8 +244,16 @@
       }
     }
   }
+  .block.listing {
+    .bandi-in-evidence .bandi-in-evidence-cards-wrapper {
+      grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+      @media (min-width: #{map-get($grid-breakpoints, md)}) and (max-width: #{map-get($grid-breakpoints, lg)}) {
+        display: block !important;
+      }
+    }
+  }
 }
 
-body.cms-ui .block.search.public-ui a {
+.cms-ui .block.search .sideColumn .columnText .draftjs-buttons a {
   color: $primary-text;
 }

package/src/customizations/volto-gdpr-privacy/components/ConditionalEmbed/ConditionalEmbed.jsx

@@ -1,135 +0,0 @@
-/*
-CUSTOMIZATIONS
-  - permit render if server, cannot use in history diff otherwise
-*/
-
-import React, { useEffect, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { useIntl, defineMessages } from 'react-intl';
-import { useLocation } from 'react-router-dom';
-import {
-  displayBanner,
-  updateGdprPrivacyConsent,
-} from 'volto-gdpr-privacy/actions';
-
-import {
-  usePanelConfigAndPreferences,
-  GDPRCookies,
-  getLocaleConf,
-} from 'volto-gdpr-privacy/helpers';
-
-import 'volto-gdpr-privacy/components/ConditionalEmbed/conditional-embed.css';
-
-const messages = defineMessages({
-  conditionalEmbedAcceptCookiesDefaultDescription: {
-    id: 'volto-gdpr-privacy-conditional-embed-default-description',
-    defaultMessage:
-      'Please, accept {cookie_type} cookies to view this content.',
-  },
-  conditionalEmbedAcceptCookiesAcceptMessage: {
-    id: 'volto-gdpr-privacy-conditional-embed-accept-message',
-    defaultMessage: '{enable_cookie_button}, or {manage_preferences_button}',
-  },
-  specificCookieLink: {
-    id: 'volto-gdpr-privacy-conditional-embed-specific-cookie-link',
-    defaultMessage: 'Enable {cookie_type} cookies',
-  },
-  genericCookieLink: {
-    id: 'volto-gdpr-privacy-conditional-embed-generic-cookie-link',
-    defaultMessage: 'manage your cookie preferences',
-  },
-});
-const ConditionalEmbed = ({ code, url, children }) => {
-  const intl = useIntl();
-  const cookies = new GDPRCookies();
-  const embed = code ?? url ?? '';
-  const dispatch = useDispatch();
-  const location = useLocation();
-
-  const { defaultPreferences } = usePanelConfigAndPreferences(cookies);
-  const profilingConfig = useSelector((state) =>
-    state.gdprPrivacyConfig?.config?.profiling?.choices?.filter(
-      (c) => c?.referenceUrls?.length > 0,
-    ),
-  );
-  const gdprPreferences = useSelector(
-    (state) => state.gdprPrivacyConsent.preferences ?? defaultPreferences,
-  );
-  const [urlReferenceConfig, setUrlReferenceConfig] = useState(null);
-
-  useEffect(() => {
-    if (profilingConfig && !urlReferenceConfig) {
-      let conditionalConfig = profilingConfig.filter(
-        (c) =>
-          c.referenceUrls.filter((r) => embed?.indexOf(r) >= 0)?.length > 0,
-      );
-
-      setUrlReferenceConfig(conditionalConfig?.[0] ?? null);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [profilingConfig, setUrlReferenceConfig, urlReferenceConfig, embed]);
-
-  //return value
-  let ret = <></>;
-  let embedDisabled = true;
-
-  embedDisabled =
-    urlReferenceConfig != null &&
-    !gdprPreferences[urlReferenceConfig.config_key];
-  const isDiffView = location.pathname?.includes('/diff');
-  if (__CLIENT__ && !gdprPreferences && !isDiffView) {
-    return <></>;
-  } else if (embedDisabled && !isDiffView) {
-    //embed disabled
-    const text = getLocaleConf(urlReferenceConfig.text, intl.locale);
-    const key = urlReferenceConfig.config_key;
-    ret = (
-      <div className="volto-gdpr-embed-disabled">
-        {text.conditional_embed_text ??
-          intl.formatMessage(
-            messages.conditionalEmbedAcceptCookiesDefaultDescription,
-            { cookie_type: key },
-          )}{' '}
-        {intl.formatMessage(
-          messages.conditionalEmbedAcceptCookiesAcceptMessage,
-          {
-            enable_cookie_button: (
-              <button
-                onClick={(e) => {
-                  e.preventDefault();
-                  cookies.set(key, true);
-                  dispatch(
-                    updateGdprPrivacyConsent({
-                      ...gdprPreferences,
-                      [key]: true,
-                    }),
-                  );
-                }}
-              >
-                {intl.formatMessage(messages.specificCookieLink, {
-                  cookie_type: key,
-                })}
-              </button>
-            ),
-            manage_preferences_button: (
-              <button
-                onClick={(e) => {
-                  e.preventDefault();
-                  dispatch(displayBanner(true, true));
-                }}
-              >
-                {intl.formatMessage(messages.genericCookieLink)}
-              </button>
-            ),
-          },
-        )}
-      </div>
-    );
-  } else {
-    ret = <>{children}</>;
-  }
-
-  return ret;
-};
-
-export default ConditionalEmbed;