design-comuni-plone-theme 11.12.9 → 11.14.0

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 
 
+## [11.14.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.13.0...v11.14.0) (2024-06-21)
+
+
+### Features
+
+* button block pos editor ([#704](https://github.com/RedTurtle/design-comuni-plone-theme/issues/704)) ([8cf55af](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8cf55afe4d2864ec72a2eba166d9e838b2304899))
+
+
+### Bug Fixes
+
+* megamenu active item ([#703](https://github.com/RedTurtle/design-comuni-plone-theme/issues/703)) ([f6668ef](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f6668ef7e7f6eaf624a3c3bd2eaf557d7f32ac14))
+* volto-form-block form result ([#700](https://github.com/RedTurtle/design-comuni-plone-theme/issues/700)) ([746502f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/746502f827359205374d54eda99ac4efd47502ba))
+
+
+### Documentation
+
+* updated publiccode and release log ([309474a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/309474adfde862d56c35c9b0832925cc157ecef0))
+
+## [11.13.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.12.9...v11.13.0) (2024-06-12)
+
+
+### Features
+
+* indicate le rassegne nei listing ([#689](https://github.com/RedTurtle/design-comuni-plone-theme/issues/689)) ([b934e89](https://github.com/RedTurtle/design-comuni-plone-theme/commit/b934e89cf6bab540c729960e1b73d9d4d9638170))
+* show more than one incarico in CT Persona ([#692](https://github.com/RedTurtle/design-comuni-plone-theme/issues/692)) ([34403db](https://github.com/RedTurtle/design-comuni-plone-theme/commit/34403dbddbc208e40a24c0681c31b17caa10768d))
+
+
+### Bug Fixes
+
+* added prefix condition to render solid icons ([#693](https://github.com/RedTurtle/design-comuni-plone-theme/issues/693)) ([145e914](https://github.com/RedTurtle/design-comuni-plone-theme/commit/145e914fad3d9091702530f1ac689d6ab51745ad))
+* better handle /diff route as non-content route because otherwise cms-ui styles are applied also on contents that starts with "diff" like "diffusione". ([#696](https://github.com/RedTurtle/design-comuni-plone-theme/issues/696)) ([027b569](https://github.com/RedTurtle/design-comuni-plone-theme/commit/027b569bdd1d1601d608f9d97904b1564c7c584e))
+* changed default filters in EventSearch DataFilter + query parameters ([#691](https://github.com/RedTurtle/design-comuni-plone-theme/issues/691)) ([6e36884](https://github.com/RedTurtle/design-comuni-plone-theme/commit/6e3688499943dee4d4ecc6ef2a1e4aeb79049727))
+* match path in search filters ([#694](https://github.com/RedTurtle/design-comuni-plone-theme/issues/694)) ([e17199b](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e17199bd29d0854bab8afe5d86cf5227d741215f))
+
+
+### Maintenance
+
+* **perf:** updated dependencies ([5d46f09](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5d46f0921b27f146b0abfe66f2c2e1522932c345))
+* removed unneccessary skiplink styles ([#695](https://github.com/RedTurtle/design-comuni-plone-theme/issues/695)) ([1727b1e](https://github.com/RedTurtle/design-comuni-plone-theme/commit/1727b1e0104a0e6b035d5813462a523c79bce872))
+
+
+### Documentation
+
+* updated publiccode and release log ([455df8d](https://github.com/RedTurtle/design-comuni-plone-theme/commit/455df8dd4ed17b9f9d4a20b96ae478a7d930c5f5))
+
 ## [11.12.9](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.12.8...v11.12.9) (2024-06-06)
 
 

package/RELEASE.md

@@ -41,6 +41,27 @@
 - ...
 -->
 
+## Versione 11.14.0 (21/06/2024)
+
+### Migliorie
+
+- Il pulsante di aggiunta dei blocchi è stato spostato nella parte bassa del blocco (non si trova più alla sua sinistra), per migliorare l'usabilità della gestione dei blocchi anche su mobile/tablet.
+
+## Versione 11.13.0 (12/06/2024)
+
+### Migliorie
+
+- Nel CT Persona viene visualizzato anche il testo del campo "Importi di viaggio e/o servizi" impostato nel CT Incarico collegato e, se presente più di un Incarico collegato, vengono mostrati i link a ciascun Incarico nella sezione "Altri incarichi".
+
+### Novità
+
+- Aggiunte informazioni sulle rassegne di eventi nei blocchi elenco.
+
+### Fix
+
+- Il bottone "callout con sfondo" della barra degli strumenti per il testo è nuovamente visibile.
+- Il blocco Ricerca Eventi permette di eliminare il filtro date.
+
 ## Versione 11.12.9 (06/06/2024)
 
 ### Fix

package/locales/de/LC_MESSAGES/volto.po

@@ -807,6 +807,11 @@ msgstr ""
 msgid "altri_documenti_persona"
 msgstr ""
 
+#: components/ItaliaTheme/View/PersonaView/PersonaRuolo
+# defaultMessage: Altri incarichi
+msgid "altri_incarichi"
+msgstr ""
+
 #: config/Blocks/ListingOptions/cardWithImageTemplate
 # defaultMessage: Mostra l'immagine per tutti gli elementi
 msgid "always_show_image"
@@ -2909,6 +2914,11 @@ msgstr ""
 msgid "quartiere"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo
+# defaultMessage: Rassegna:
+msgid "rassegna_label"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeader
 # defaultMessage: Tempo di lettura
 msgid "reading_time"

package/locales/en/LC_MESSAGES/volto.po

@@ -792,6 +792,11 @@ msgstr "Other documents"
 msgid "altri_documenti_persona"
 msgstr "Other documents"
 
+#: components/ItaliaTheme/View/PersonaView/PersonaRuolo
+# defaultMessage: Altri incarichi
+msgid "altri_incarichi"
+msgstr "Other roles"
+
 #: config/Blocks/ListingOptions/cardWithImageTemplate
 # defaultMessage: Mostra l'immagine per tutti gli elementi
 msgid "always_show_image"
@@ -2894,6 +2899,11 @@ msgstr ""
 msgid "quartiere"
 msgstr "District "
 
+#: components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo
+# defaultMessage: Rassegna:
+msgid "rassegna_label"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeader
 # defaultMessage: Tempo di lettura
 msgid "reading_time"

package/locales/es/LC_MESSAGES/volto.po

@@ -801,6 +801,11 @@ msgstr "Otros documentos"
 msgid "altri_documenti_persona"
 msgstr ""
 
+#: components/ItaliaTheme/View/PersonaView/PersonaRuolo
+# defaultMessage: Altri incarichi
+msgid "altri_incarichi"
+msgstr ""
+
 #: config/Blocks/ListingOptions/cardWithImageTemplate
 # defaultMessage: Mostra l'immagine per tutti gli elementi
 msgid "always_show_image"
@@ -2903,6 +2908,11 @@ msgstr ""
 msgid "quartiere"
 msgstr "Vecindario"
 
+#: components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo
+# defaultMessage: Rassegna:
+msgid "rassegna_label"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeader
 # defaultMessage: Tempo di lettura
 msgid "reading_time"

package/locales/fr/LC_MESSAGES/volto.po

@@ -809,6 +809,11 @@ msgstr "Autres documents"
 msgid "altri_documenti_persona"
 msgstr ""
 
+#: components/ItaliaTheme/View/PersonaView/PersonaRuolo
+# defaultMessage: Altri incarichi
+msgid "altri_incarichi"
+msgstr ""
+
 #: config/Blocks/ListingOptions/cardWithImageTemplate
 # defaultMessage: Mostra l'immagine per tutti gli elementi
 msgid "always_show_image"
@@ -2911,6 +2916,11 @@ msgstr ""
 msgid "quartiere"
 msgstr "Quartier "
 
+#: components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo
+# defaultMessage: Rassegna:
+msgid "rassegna_label"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeader
 # defaultMessage: Tempo di lettura
 msgid "reading_time"

package/locales/it/LC_MESSAGES/volto.po

@@ -792,6 +792,11 @@ msgstr "Documenti"
 msgid "altri_documenti_persona"
 msgstr "Altri documenti"
 
+#: components/ItaliaTheme/View/PersonaView/PersonaRuolo
+# defaultMessage: Altri incarichi
+msgid "altri_incarichi"
+msgstr ""
+
 #: config/Blocks/ListingOptions/cardWithImageTemplate
 # defaultMessage: Mostra l'immagine per tutti gli elementi
 msgid "always_show_image"
@@ -2894,6 +2899,11 @@ msgstr "Data di pubblicazione"
 msgid "quartiere"
 msgstr "Quartiere"
 
+#: components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo
+# defaultMessage: Rassegna:
+msgid "rassegna_label"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeader
 # defaultMessage: Tempo di lettura
 msgid "reading_time"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-05-15T15:55:46.048Z\n"
+"POT-Creation-Date: 2024-06-11T14:57:29.832Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -794,6 +794,11 @@ msgstr ""
 msgid "altri_documenti_persona"
 msgstr ""
 
+#: components/ItaliaTheme/View/PersonaView/PersonaRuolo
+# defaultMessage: Altri incarichi
+msgid "altri_incarichi"
+msgstr ""
+
 #: config/Blocks/ListingOptions/cardWithImageTemplate
 # defaultMessage: Mostra l'immagine per tutti gli elementi
 msgid "always_show_image"
@@ -2896,6 +2901,11 @@ msgstr ""
 msgid "quartiere"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo
+# defaultMessage: Rassegna:
+msgid "rassegna_label"
+msgstr ""
+
 #: components/ItaliaTheme/View/Commons/PageHeader/PageHeader
 # defaultMessage: Tempo di lettura
 msgid "reading_time"

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.12.9",
+  "version": "11.14.0",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -129,7 +129,7 @@
     "@babel/plugin-proposal-throw-expressions": "7.18.6",
     "@eeacms/volto-taxonomy": "^1.0.0",
     "@loadable/babel-plugin": "5.13.2",
-    "@plone-collective/volto-sentry": "0.3.0",
+    "@plone-collective/volto-sentry": "0.3.1",
     "bootstrap-italia": "2.6.1",
     "classnames": "^2.3.2",
     "design-react-kit": "5.0.0-1",
@@ -146,24 +146,24 @@
     "typeface-lora": "0.0.72",
     "typeface-roboto-mono": "0.0.75",
     "typeface-titillium-web": "0.0.72",
-    "volto-blocks-widget": "3.4.0",
+    "volto-blocks-widget": "3.4.1",
     "volto-data-grid-widget": "2.3.1",
-    "volto-dropdownmenu": "4.1.1",
-    "volto-editablefooter": "5.1.1",
-    "volto-feedback": "0.3.0",
-    "volto-form-block": "3.8.3",
-    "volto-gdpr-privacy": "2.2.5",
+    "volto-dropdownmenu": "4.1.3",
+    "volto-editablefooter": "5.1.6",
+    "volto-feedback": "0.3.2",
+    "volto-form-block": "3.8.6",
+    "volto-gdpr-privacy": "2.2.6",
     "volto-google-analytics": "2.0.0",
     "volto-multilingual-widget": "3.2.1",
     "volto-querywidget-with-browser": "0.4.2",
     "volto-rss-block": "3.0.0",
-    "volto-secondarymenu": "4.0.0",
-    "volto-slimheader": "0.1.1",
+    "volto-secondarymenu": "4.1.1",
+    "volto-slimheader": "0.1.2",
     "volto-social-settings": "3.0.0",
-    "volto-subblocks": "2.0.0",
-    "volto-subfooter": "3.0.0",
-    "volto-subsites": "4.0.0",
-    "volto-venue": "4.0.2",
+    "volto-subblocks": "2.1.0",
+    "volto-subfooter": "3.1.1",
+    "volto-subsites": "4.0.1",
+    "volto-venue": "4.1.0",
     "webpack-image-resize-loader": "^5.0.0"
   },
   "devDependencies": {

package/publiccode.yml

@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-06-06'
+releaseDate: '2024-06-21'
 softwareType: standalone/web
-softwareVersion: 11.12.9
+softwareVersion: 11.14.0
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

package/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx

@@ -101,6 +101,8 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
           fullobjects: 1,
           query: query,
           b_size: b_size,
+          sort_order: 'ascending',
+          sort_on: 'start',
         },
         id + '_events_search',
         page,

package/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js

@@ -99,12 +99,12 @@ const DefaultFilters = () => {
         component: DateFilter,
         props: {
           value: {
-            startDate: moment().startOf('day'),
-            endDate: moment().endOf('day'),
+            startDate: null,
+            endDate: null,
           },
           showClearDates: true,
-          defaultStart: moment().startOf('day'),
-          defaultEnd: moment().endOf('day'),
+          defaultStart: null,
+          defaultEnd: null,
           isOutsideRange: () => false,
         },
       },

package/src/components/ItaliaTheme/Blocks/Listing/CardWithImage/CardWithImageDefault.jsx

@@ -31,6 +31,7 @@ import {
   ListingImage,
   ListingText,
   CardPersona,
+  RassegnaInfo,
 } from 'design-comuni-plone-theme/components/ItaliaTheme';
 
 const CardWithImageDefault = (props) => {
@@ -72,6 +73,9 @@ const CardWithImageDefault = (props) => {
     dependencies: ['CardWithImageDefault', item['@type']],
   }).component;
 
+  const isEventAppointment =
+    item?.parent?.['@type'] === 'Event' && item?.['@type'] === 'Event';
+
   return (
     <>
       {item['@type'] === 'Persona' ? (
@@ -119,7 +123,12 @@ const CardWithImageDefault = (props) => {
                 <ListingCategory category={category} item={item} />
               </CardCategory>
             )}
-            <CardTitle tag="h3">
+            <CardTitle
+              tag="h3"
+              className={`${
+                isEventAppointment ? 'rassegna-appointment-title' : ''
+              }`}
+            >
               <UniversalLink
                 item={!isEditMode ? item : null}
                 href={isEditMode ? '#' : ''}
@@ -129,6 +138,7 @@ const CardWithImageDefault = (props) => {
                 {item.title || item.id}
               </UniversalLink>
             </CardTitle>
+            {isEventAppointment && <RassegnaInfo eventoPadre={item.parent} />}
             {listingText && (
               <CardText
                 className={cx('', {

package/src/components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { UniversalLink } from '@plone/volto/components';
+
+const RassegnaInfo = ({ eventoPadre }) => {
+  const intl = useIntl();
+  return (
+    <div className="rassegna-info mb-3 mt-1">
+      <span className="rassegna-label">
+        {intl.formatMessage(messages.rassegna_label)}
+      </span>
+      <span className="rassegna-name">
+        <UniversalLink href={eventoPadre['@id']}>
+          {eventoPadre.title}
+        </UniversalLink>
+      </span>
+    </div>
+  );
+};
+
+const messages = defineMessages({
+  rassegna_label: {
+    id: 'rassegna_label',
+    defaultMessage: 'Rassegna:',
+  },
+});
+
+export default RassegnaInfo;

package/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx

@@ -31,6 +31,7 @@ import {
   getItemIcon,
   // ListingLinkMore,
   ListingImage,
+  RassegnaInfo,
 } from 'design-comuni-plone-theme/components/ItaliaTheme';
 
 const ContentInEvidenceTemplate = (props) => {
@@ -78,6 +79,9 @@ const ContentInEvidenceTemplate = (props) => {
             dependencies: ['ContentInEvidenceTemplate', item['@type']],
           }).component;
 
+          const isEventAppointment =
+            item?.parent?.['@type'] === 'Event' && item?.['@type'] === 'Event';
+
           return (
             <Row key={item['@id']} className="content-in-evidence">
               {image && (
@@ -93,11 +97,19 @@ const ContentInEvidenceTemplate = (props) => {
                         item={item}
                       />
                     </CardCategory>
-                    <CardTitle tag="h2">
+                    <CardTitle
+                      tag="h2"
+                      className={`${
+                        isEventAppointment ? 'rassegna-appointment-title' : ''
+                      }`}
+                    >
                       <UniversalLink item={item} data-element={id_lighthouse}>
                         {item.title}
                       </UniversalLink>
                     </CardTitle>
+                    {isEventAppointment && (
+                      <RassegnaInfo eventoPadre={item.parent} />
+                    )}
                     <CardText>{listingText}</CardText>
 
                     {item.tassonomia_argomenti &&

package/src/components/ItaliaTheme/Blocks/Listing/InEvidenceTemplate.jsx

@@ -33,6 +33,7 @@ import {
   ListingImage,
   CardCategory,
   CardPersona,
+  RassegnaInfo,
 } from 'design-comuni-plone-theme/components/ItaliaTheme';
 import { getCategory } from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/Commons/utils';
 
@@ -94,6 +95,10 @@ const InEvidenceTemplate = (props) => {
             const category = getCategory(item, show_type, show_section, props);
             const topics = show_topics ? item.tassonomia_argomenti : null;
 
+            const isEventAppointment =
+              item?.parent?.['@type'] === 'Event' &&
+              item?.['@type'] === 'Event';
+
             return item['@type'] === 'Persona' ? (
               <CardPersona
                 item={item}
@@ -124,7 +129,12 @@ const InEvidenceTemplate = (props) => {
                       )}
                     </CardCategory>
                   )}
-                  <CardTitle tag="h3">
+                  <CardTitle
+                    tag="h3"
+                    className={`${
+                      isEventAppointment ? 'rassegna-appointment-title' : ''
+                    }`}
+                  >
                     <UniversalLink
                       item={!isEditMode ? item : null}
                       href={isEditMode ? '#' : null}
@@ -133,6 +143,9 @@ const InEvidenceTemplate = (props) => {
                       {item.title || item.id}
                     </UniversalLink>
                   </CardTitle>
+                  {isEventAppointment && (
+                    <RassegnaInfo eventoPadre={item.parent} />
+                  )}
                   {listingText && (
                     <CardText
                       className={cx('', {

package/src/components/ItaliaTheme/Blocks/Listing/RibbonCardTemplate.jsx

@@ -22,6 +22,7 @@ import {
   getItemIcon,
   ListingText,
   ListingLinkMore,
+  RassegnaInfo,
 } from 'design-comuni-plone-theme/components/ItaliaTheme';
 import {
   getCalendarDate,
@@ -100,6 +101,10 @@ const RibbonCardTemplate = (props) => {
               name: 'BlockExtraTags',
               dependencies: ['RibbonCardTemplate', item['@type']],
             }).component;
+
+            const isEventAppointment =
+              item.parent?.['@type'] === 'Event' && item?.['@type'] === 'Event';
+
             return (
               <Col lg={4} sm={12} key={index}>
                 <Card
@@ -133,7 +138,12 @@ const RibbonCardTemplate = (props) => {
                     className={cx('', { 'mt-5': !showRibbon })}
                   >
                     {date && <div className="dates">{date}</div>}
-                    <CardTitle tag="h3">
+                    <CardTitle
+                      tag="h3"
+                      className={`${
+                        isEventAppointment ? 'rassegna-appointment-title' : ''
+                      }`}
+                    >
                       <UniversalLink
                         item={!isEditMode ? item : null}
                         href={isEditMode ? '#' : null}
@@ -142,6 +152,10 @@ const RibbonCardTemplate = (props) => {
                         {itemTitle}
                       </UniversalLink>
                     </CardTitle>
+                    {isEventAppointment && (
+                      <RassegnaInfo eventoPadre={item.parent} />
+                    )}
+
                     {listingText && <CardText>{listingText}</CardText>}
                     <BlockExtraTags {...props} item={item} itemIndex={index} />
                     {eventRecurrenceMore}

package/src/components/ItaliaTheme/Blocks/Listing/SimpleCard/Card/SimpleCardDefault.jsx

@@ -19,6 +19,7 @@ import {
   getItemIcon,
   ListingCategory,
   ListingText,
+  RassegnaInfo,
 } from 'design-comuni-plone-theme/components/ItaliaTheme';
 import {
   getCalendarDate,
@@ -91,6 +92,9 @@ const SimpleCardDefault = (props) => {
     dependencies: ['SimpleCardDefault', type],
   }).component;
 
+  const isEventAppointment =
+    item?.parent?.['@type'] === 'Event' && item?.['@type'] === 'Event';
+
   return (
     <Card
       className={`align-items-top rounded shadow no-after ${getItemClass(
@@ -114,7 +118,12 @@ const SimpleCardDefault = (props) => {
             )}
           </CardCategory>
         )}
-        <CardTitle tag="h3">
+        <CardTitle
+          tag="h3"
+          className={`${
+            isEventAppointment ? 'rassegna-appointment-title' : ''
+          }`}
+        >
           <UniversalLink
             item={!isEditMode ? item : null}
             href={isEditMode ? '#' : null}
@@ -124,6 +133,7 @@ const SimpleCardDefault = (props) => {
             {itemTitle}
           </UniversalLink>
         </CardTitle>
+        {isEventAppointment && <RassegnaInfo eventoPadre={item.parent} />}
         {listingText && (
           <CardText className={cx('', { 'mb-5': eventRecurrenceMore })}>
             {listingText}

package/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx

@@ -36,10 +36,12 @@ const FontAwesomeIcon = (props) => {
       prefixKey === 'fab'
         ? 'brands'
         : prefixKey === 'far'
-          ? 'regular'
-          : prefixKey != null
-            ? prefixKey
-            : 'solid',
+        ? 'regular'
+        : prefixKey === 'fas'
+        ? 'solid'
+        : prefixKey != null
+        ? prefixKey
+        : 'solid',
       iconName,
     ];
   };

package/src/components/ItaliaTheme/MegaMenu/MegaMenu.jsx

@@ -66,7 +66,10 @@ const isActive = (item, pathname) => {
   );
 };
 
-const isChildActive = (itemUrl, pathname) => {
+const isChildActive = (itemUrl, pathname, exact = false) => {
+  if (exact) {
+    return itemUrl === pathname;
+  }
   return pathname.indexOf(itemUrl) > -1;
 };
 
@@ -328,6 +331,7 @@ const MegaMenu = ({ item, pathname }) => {
                                     active: isChildActive(
                                       flattenToAppURL(child['@id']),
                                       pathname,
+                                      true,
                                     ),
                                   })}
                                   role="menuitem"

package/src/components/ItaliaTheme/SkipLinks/SkipLinks.jsx

@@ -31,17 +31,19 @@ const SkipLinks = () => {
   }, []);
 
   return (
-    <Skiplink tag="div">
-      <SkiplinkItem href="#view" tag="a">
-        {intl.formatMessage(messages.mainView)}
-      </SkiplinkItem>
-      <SkiplinkItem href="#navigation" tag="a">
-        {intl.formatMessage(messages.navigation)}
-      </SkiplinkItem>
-      <SkiplinkItem href="#footer" tag="a">
-        {intl.formatMessage(messages.footer)}
-      </SkiplinkItem>
-    </Skiplink>
+    <div className="public-ui">
+      <Skiplink tag="div">
+        <SkiplinkItem href="#view" tag="a">
+          {intl.formatMessage(messages.mainView)}
+        </SkiplinkItem>
+        <SkiplinkItem href="#navigation" tag="a">
+          {intl.formatMessage(messages.navigation)}
+        </SkiplinkItem>
+        <SkiplinkItem href="#footer" tag="a">
+          {intl.formatMessage(messages.footer)}
+        </SkiplinkItem>
+      </Skiplink>
+    </div>
   );
 };
 

package/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx

@@ -74,6 +74,10 @@ const messages = defineMessages({
     defaultMessage:
       "Ha fatto parte dell'organizzazione comunale come {incarico} fino al",
   },
+  altri_incarichi: {
+    id: 'altri_incarichi',
+    defaultMessage: 'Altri incarichi',
+  },
 });
 
 const PersonaRuolo = ({ content }) => {
@@ -86,16 +90,16 @@ const PersonaRuolo = ({ content }) => {
             tag_id="incarico"
             title={intl.formatMessage(messages.ruolo)}
           >
-            {content?.incarichi_persona?.map((incarico) => (
-              <div className="font-serif" key={incarico.id}>
-                <p>{incarico.title}</p>
-                {incarico.atto_di_nomina && (
-                  <UniversalLink href={incarico.atto_di_nomina}>
-                    {intl.formatMessage(messages.atto_nomina)}
-                  </UniversalLink>
-                )}
-              </div>
-            ))}
+            <div className="font-serif" key={content?.incarichi_persona[0]?.id}>
+              <p>{content?.incarichi_persona[0]?.title}</p>
+              {content?.incarichi_persona[0]?.atto_di_nomina && (
+                <UniversalLink
+                  href={content?.incarichi_persona[0]?.atto_di_nomina}
+                >
+                  {intl.formatMessage(messages.atto_nomina)}
+                </UniversalLink>
+              )}
+            </div>
           </RichTextSection>
           {content.incarichi_persona[0]?.tipologia_incarico?.title && (
             <RichTextSection
@@ -152,7 +156,7 @@ const PersonaRuolo = ({ content }) => {
               title={intl.formatMessage(
                 messages.importi_di_viaggio_e_o_servizi,
               )}
-              data={content.incarichi_persona[0].importi_di_viaggio_e_o_servizi}
+              data={content.incarichi_persona[0].importi_viaggio_servizio}
             >
               {content.incarichi_persona[0]?.importi_di_viaggio_e_o_servizi
                 ?.length > 0 && (
@@ -233,6 +237,26 @@ const PersonaRuolo = ({ content }) => {
           )}
         </>
       )}
+
+      {content.incarichi_persona?.length > 1 && (
+        <RichTextSection
+          tag_id="altri_incarichi"
+          title={intl.formatMessage(messages.altri_incarichi)}
+        >
+          <ul>
+            {content.incarichi_persona.map((incarico, index) =>
+              index > 0 ? (
+                <li key={index}>
+                  <UniversalLink href={incarico['@id']}>
+                    {incarico.title}
+                  </UniversalLink>
+                </li>
+              ) : null,
+            )}
+          </ul>
+        </RichTextSection>
+      )}
+
       {content.assessore_di?.length > 0 && (
         <RichTextSection
           tag_id="assessore_di"

package/src/components/ItaliaTheme/index.js

@@ -80,6 +80,7 @@ export SearchSectionsBackground from 'design-comuni-plone-theme/components/Itali
 export BackgroundUser from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/SearchSections/BackgroundUser';
 export Skeleton from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/TemplatesSkeletons/Skeleton';
 export CardCalendar from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/Commons/CardCalendar';
+export RassegnaInfo from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo';
 export ListingCategory from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/Commons/ListingCategory';
 export ListingText from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/Commons/ListingText';
 export ListingLinkMore from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/Commons/ListingLinkMore';

package/src/config/italiaConfig.js

@@ -66,8 +66,8 @@ import { schemaListing } from 'design-comuni-plone-theme/components/ItaliaTheme/
 
 import reducers from 'design-comuni-plone-theme/reducers';
 
-const ReleaseLog = loadable(
-  () => import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
+const ReleaseLog = loadable(() =>
+  import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
 );
 
 const messages = defineMessages({
@@ -84,7 +84,7 @@ export default function applyConfig(voltoConfig) {
    * SETTINGS
    ******************************************************************************/
   const voltoSentryOptions = voltoConfig.settings.sentryOptions;
-
+  config.experimental.addBlockButton.enabled = true; //per spostare il bottone di aggiunta dei blocchi in basso, e fare in modo che i bottoni di edit dei blocchi siano usabili anche da tablet/mobile
   config.settings = {
     ...config.settings,
     openExternalLinkInNewTab: true,
@@ -342,8 +342,10 @@ export default function applyConfig(voltoConfig) {
   };
 
   config.settings.nonContentRoutes = config.settings.nonContentRoutes.filter(
-    (route) => route !== '/contact-form',
+    (route) => route !== '/contact-form' && route !== '/diff',
   );
+  config.settings.nonContentRoutes.push(/\/diff$/);
+  config.settings.nonContentRoutes.push('/diff\\?');
   config.settings.nonContentRoutes.push('/release-log');
 
   /******************************************************************************

package/src/helpers/ListingHelper.js

@@ -90,7 +90,7 @@ export const getEventRecurrenceMore = (item, isEditMode) => {
   const intl = Intl();
   let ret = null;
   if (item['@type'] === 'Event') {
-    if (item.recurrence) {
+    if (item.recurrence || item.rassegna) {
       ret = (
         <Link
           to={!isEditMode ? flattenToAppURL(item['@id']) : '#'}

package/src/helpers/getItemsByPath.js

@@ -1,3 +1,25 @@
+/**
+ * Retrieves items based on a given pathname from a list of items with specified root paths.
+ *
+ * @param {Array} items - An array of objects where each object contains a `rootPath` and `items` property.
+ * @param {string} pathname - The pathname to match against the root paths.
+ * @param {boolean} [defaultRootPath=true] - A flag to determine if the root path ('/') items should be returned when no match is found.
+ * @returns {Array} - The items corresponding to the matched root path or the root path if no match is found and defaultRootPath is true. Returns an empty array if no match is found and defaultRootPath is false.
+ *
+ * @example
+ * // Sample items array
+ * const items = [
+ *   { rootPath: '/', items: ['homeItem1', 'homeItem2'] },
+ *   { rootPath: '/about', items: ['aboutItem1'] },
+ *   { rootPath: '/products', items: ['productItem1', 'productItem2'] },
+ * ];
+ *
+ * getItemsByPath(items, '/about'); // returns ['aboutItem1']
+ * getItemsByPath(items, '/products/item'); // returns ['productItem1', 'productItem2']
+ * getItemsByPath(items, '/contact'); // returns ['homeItem1', 'homeItem2'] assuming defaultRootPath is true
+ * getItemsByPath(items, '/contact', false); // returns []
+ */
+
 export function getItemsByPath(items, pathname, defaultRootPath = true) {
   let rootPathConfig = null;
   const itemsByPath = items?.reduce((acc, val) => {
@@ -8,7 +30,7 @@ export function getItemsByPath(items, pathname, defaultRootPath = true) {
     return { ...acc, [val.rootPath]: val };
   }, {});
   const matchingPaths = Object.keys(itemsByPath)
-    .filter((path) => pathname.startsWith(path))
+    .filter((path) => pathname === path || pathname.startsWith(`${path}/`))
     .sort((a, b) => {
       if (a.length > b.length) return -1;
       else if (a.length < b.length) return 1;

package/src/theme/ItaliaTheme/Components/_card.scss

@@ -166,15 +166,35 @@
   }
 }
 
-.block.listing.simpleCard {
-  @include media-breakpoint-down(xl) {
-    .card {
-      row-gap: 0.56em;
+.block.listing {
+  &.simpleCard {
+    @include media-breakpoint-down(xl) {
+      .card {
+        row-gap: 0.56em;
+      }
+
+      .card-body {
+        flex-basis: 100%;
+        margin-left: 0em;
+      }
     }
+  }
 
-    .card-body {
-      flex-basis: 100%;
-      margin-left: 0em;
+  .card {
+    .card-title {
+      &.rassegna-appointment-title {
+        margin-bottom: 0px !important;
+      }
+    }
+
+    .rassegna-info {
+      font-size: 0.9rem;
+      display: inline-flex;
+      column-gap: 0.3rem;
+
+      a {
+        text-decoration: none;
+      }
     }
   }
 }

package/src/theme/_cms-ui.scss

@@ -192,32 +192,6 @@ body.cms-ui {
     }
   }
 
-  .skiplinks {
-    position: absolute;
-    top: -100%;
-
-    a {
-      display: inline-block;
-      color: $link-color;
-
-      &:focus {
-        position: fixed;
-        z-index: 9999;
-        top: 10px;
-        left: 10px;
-        padding: 10px;
-        border: 2px solid $link-color;
-        background: #fff;
-        outline: 3px solid $link-color;
-      }
-
-      &:hover {
-        border-color: $link-color;
-        color: $link-color;
-      }
-    }
-  }
-
   .react-select__menu {
     z-index: 11;
 
@@ -270,6 +244,11 @@ body.cms-ui {
     }
   }
 
+  /*Block chooser*/
+  [data-popper-placement] {
+    z-index: 1000;
+  }
+
   .sidebar-container {
     .numbers-block-sidebar-form-container {
       padding-bottom: 1rem;

package/src/customizations/volto/components/manage/BlockChooser/BlockChooserButton.jsx

@@ -1,157 +0,0 @@
-/* CUSTOMIZATIONS
-- zindex for handling overlapping in small pages
-*/
-
-import React from 'react';
-import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
-import addSVG from '@plone/volto/icons/circle-plus.svg';
-import { blockHasValue } from '@plone/volto/helpers';
-import { Icon, BlockChooser } from '@plone/volto/components';
-import config from '@plone/volto/registry';
-import { Button, Ref } from 'semantic-ui-react';
-import { defineMessages, useIntl } from 'react-intl';
-import { usePopper } from 'react-popper';
-import { Portal } from 'react-portal';
-
-const messages = defineMessages({
-  addBlock: {
-    id: 'Add block',
-    defaultMessage: 'Add block',
-  },
-});
-
-export const ButtonComponent = (props) => {
-  const intl = useIntl();
-  const {
-    className = `block-add-button${
-      config.experimental.addBlockButton.enabled ? ' new-add-block' : ''
-    }`,
-    size = '19px',
-    onShowBlockChooser,
-  } = props;
-
-  return (
-    <Button
-      icon
-      basic
-      title={intl.formatMessage(messages.addBlock)}
-      onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        onShowBlockChooser();
-      }}
-      className={className}
-    >
-      <Icon name={addSVG} className={className} size={size} />
-    </Button>
-  );
-};
-
-const BlockChooserButton = (props) => {
-  const {
-    block,
-    allowedBlocks,
-    showRestricted,
-    data,
-    onMutateBlock,
-    onInsertBlock,
-    blocksConfig,
-    buttonComponent,
-    properties,
-  } = props;
-  const { disableNewBlocks } = data;
-  const [addNewBlockOpened, setAddNewBlockOpened] = React.useState(false);
-
-  const blockChooserRef = React.useRef();
-
-  const handleClickOutside = React.useCallback((e) => {
-    if (
-      blockChooserRef.current &&
-      doesNodeContainClick(blockChooserRef.current, e)
-    )
-      return;
-    setAddNewBlockOpened(false);
-  }, []);
-
-  const Component = buttonComponent || ButtonComponent;
-
-  React.useEffect(() => {
-    document.addEventListener('mousedown', handleClickOutside, false);
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside, false);
-    };
-  }, [handleClickOutside]);
-
-  const [referenceElement, setReferenceElement] = React.useState(null);
-  const [popperElement, setPopperElement] = React.useState(null);
-  const { styles, attributes } = usePopper(referenceElement, popperElement, {
-    placement: config.experimental.addBlockButton.enabled
-      ? 'bottom'
-      : 'right-start',
-    modifiers: [
-      {
-        name: 'offset',
-        options: {
-          offset: [-10, 5],
-        },
-      },
-      {
-        name: 'flip',
-        options: {
-          fallbackPlacements: ['right-end', 'top-start'],
-        },
-      },
-    ],
-  });
-
-  return (
-    <>
-      {!disableNewBlocks &&
-        (config.experimental.addBlockButton.enabled ||
-          !blockHasValue(data)) && (
-          <Ref innerRef={setReferenceElement}>
-            <Component
-              {...props}
-              onShowBlockChooser={() => setAddNewBlockOpened(true)}
-            />
-          </Ref>
-        )}
-      {addNewBlockOpened && (
-        <Portal node={document.getElementById('body')}>
-          <div
-            ref={setPopperElement}
-            style={{ ...styles.popper, zIndex: 1000 }}
-            {...attributes.popper}
-          >
-            <BlockChooser
-              onMutateBlock={
-                onMutateBlock
-                  ? (id, value) => {
-                      setAddNewBlockOpened(false);
-                      onMutateBlock(id, value);
-                    }
-                  : null
-              }
-              onInsertBlock={
-                onInsertBlock
-                  ? (id, value) => {
-                      setAddNewBlockOpened(false);
-                      onInsertBlock(id, value);
-                    }
-                  : null
-              }
-              currentBlock={block}
-              allowedBlocks={allowedBlocks}
-              blocksConfig={blocksConfig}
-              properties={properties}
-              showRestricted={showRestricted}
-              ref={blockChooserRef}
-            />
-          </div>
-        </Portal>
-      )}
-    </>
-  );
-};
-
-export default BlockChooserButton;