Merge branch 'v2' into bug_52833_redirect_post_login_does_not_work

RedTurtle · Mar 4, 2024 · 4c2a14d · 4c2a14d
2 parents 1e53b5a + 74d145a
commit 4c2a14d
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+### [7.25.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v7.25.1...v7.25.2) (2024-03-04)
+
+
+### Bug Fixes
+
+* check rich text has content in iconsBlock ([#561](https://github.com/RedTurtle/design-comuni-plone-theme/issues/561)) ([3c51192](https://github.com/RedTurtle/design-comuni-plone-theme/commit/3c511927ed0740ade6f3aa0c1fc5edcc1ef15b36))
+* table mobile ([#539](https://github.com/RedTurtle/design-comuni-plone-theme/issues/539)) ([5ee242f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5ee242fd9c21665c79ff36b3d88c96e615796ace))
+
+
+### Maintenance
+
+* back to previous version 7.25.1 ([07ee781](https://github.com/RedTurtle/design-comuni-plone-theme/commit/07ee78198ed6223805e75891ad7a6d3b702ed26b))
+* preparing release 7.2.5.2 ([e92f69a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e92f69a819deff93b9730e8056ffdfcef6cc7067))
+* release v7.25.2 ([8a4b572](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8a4b5722ca33c9f8947055745bb6a5f537287372))
+
 ### [7.25.1](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v7.25.0...v7.25.1) (2024-02-23)
 
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -32,11 +32,21 @@
 
 ## Versione X.X.X (dd/mm/yyyy)
 
+### Migliorie
+
+- Migliorata l'accessibilità del menu in versione mobile.
+
 ### Fix
 
-- Visualizzazione mobile per il blocco tabella sistemata.
 - Quando si clicca sul bottone di login da una pagina specifica, dopo il login si viene reindirizzati alla pagina di provenienza.
 
+## Versione 7.25.2 (04/03/2024)
+
+### Fix
+
+- Sistemata la visualizzazione mobile per il blocco tabella.
+- Blocco icone: sistemata la visualizzazione del Titolo e Descrizione nel caso in cui siano vuoti.
+
 ## Versione 7.25.0 (20/02/2024)
 
 ### Novità

diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po
@@ -1246,6 +1246,11 @@ msgstr ""
 msgid "color_primary"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
+# defaultMessage: Secondario
+msgid "color_secondary"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HighlightedContent/Sidebar
 #: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
 # defaultMessage: Trasparente

diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po
@@ -1231,6 +1231,11 @@ msgstr ""
 msgid "color_primary"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
+# defaultMessage: Secondario
+msgid "color_secondary"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HighlightedContent/Sidebar
 #: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
 # defaultMessage: Trasparente

diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po
@@ -1240,6 +1240,11 @@ msgstr "Naranja"
 msgid "color_primary"
 msgstr "Primario"
 
+#: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
+# defaultMessage: Secondario
+msgid "color_secondary"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HighlightedContent/Sidebar
 #: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
 # defaultMessage: Trasparente

diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po
@@ -1248,6 +1248,11 @@ msgstr ""
 msgid "color_primary"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
+# defaultMessage: Secondario
+msgid "color_secondary"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HighlightedContent/Sidebar
 #: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
 # defaultMessage: Trasparente

diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po
@@ -1231,6 +1231,11 @@ msgstr "Arancione"
 msgid "color_primary"
 msgstr "Colore primario"
 
+#: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
+# defaultMessage: Secondario
+msgid "color_secondary"
+msgstr "Colore secondario"
+
 #: components/ItaliaTheme/Blocks/HighlightedContent/Sidebar
 #: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
 # defaultMessage: Trasparente

diff --git a/locales/volto.pot b/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-02-07T17:28:21.593Z\n"
+"POT-Creation-Date: 2024-02-29T10:45:35.413Z\n"
 "Last-Translator: Plone i18n <[email protected]>\n"
 "Language-Team: Plone i18n <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -1233,6 +1233,11 @@ msgstr ""
 msgid "color_primary"
 msgstr ""
 
+#: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
+# defaultMessage: Secondario
+msgid "color_secondary"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HighlightedContent/Sidebar
 #: components/ItaliaTheme/Blocks/IconBlocks/Sidebar
 # defaultMessage: Trasparente

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "MIT",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "addons": [
     "@plone-collective/volto-sentry",
     "volto-multilingual-widget",

diff --git a/publiccode.yml b/publiccode.yml
@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-02-23'
+releaseDate: '2024-03-04'
 softwareType: standalone/web
-softwareVersion: 7.25.1
+softwareVersion: 7.25.2
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/Blocks/IconBlocks/Sidebar.jsx b/src/components/ItaliaTheme/Blocks/IconBlocks/Sidebar.jsx
@@ -47,8 +47,8 @@ const messages = defineMessages({
     defaultMessage: 'Primario',
   },
   color_secondary: {
-    id: 'color_primary',
-    defaultMessage: 'Primario',
+    id: 'color_secondary',
+    defaultMessage: 'Secondario',
   },
   color_transparent: {
     id: 'color_transparent',

diff --git a/src/components/ItaliaTheme/Blocks/IconBlocks/View.jsx b/src/components/ItaliaTheme/Blocks/IconBlocks/View.jsx
@@ -10,6 +10,7 @@ import ViewBlock from './Block/ViewBlock';
 import { Container, Row, Col } from 'design-react-kit/dist/design-react-kit';
 import { flattenToAppURL, addAppURL } from '@plone/volto/helpers';
 import { UniversalLink } from '@plone/volto/components';
+import { richTextHasContent } from 'design-comuni-plone-theme/components/ItaliaTheme/View';
 import config from '@plone/volto/registry';
 import cx from 'classnames';
 
@@ -46,7 +47,7 @@ const AccordionView = ({ data, block }) => {
           )}
           <Container className={`px-md-4 ${data.bg_color}`}>
             <div className="block-header">
-              {data.title && (
+              {richTextHasContent(data.title) && (
                 <div className="title">
                   {redraft(
                     data.title,
@@ -55,7 +56,7 @@ const AccordionView = ({ data, block }) => {
                   )}
                 </div>
               )}
-              {data.description && (
+              {richTextHasContent(data.description) && (
                 <div className="description">
                   {redraft(
                     data.description,

diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx
@@ -96,7 +96,7 @@ const Navigation = ({ pathname }) => {
       {menu?.length > 0 ? (
         <HeaderContent expand="lg" megamenu id="navigation">
           <HeaderToggler
-            aria-controls="#it-navigation-collapse"
+            aria-controls="it-navigation-collapse"
             aria-expanded={collapseOpen}
             aria-label="Toggle navigation"
             onClick={() => {