Merge branch 'v2' into us_49345_v2_selezione_filtri

RedTurtle · Jan 16, 2024 · 08c1da7 · 08c1da7
2 parents 6491493 + 1736e7b
commit 08c1da7
Show file tree

Hide file tree

Showing 18 changed files with 250 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### [7.24.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v7.24.1...v7.24.2) (2024-01-11)
+
+
+### Bug Fixes
+
+* fixed reccurence text ([#480](https://github.com/RedTurtle/design-comuni-plone-theme/issues/480)) ([14bdd47](https://github.com/RedTurtle/design-comuni-plone-theme/commit/14bdd47a2363e589133ee10a9c88d8b13d20a74e))
+
+
+### Maintenance
+
+* preparing release 7.24.2 ([bf26049](https://github.com/RedTurtle/design-comuni-plone-theme/commit/bf26049904e4e394569a85175b0dc083bb29b22d))
+
 ### [7.24.1](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v7.24.0...v7.24.1) (2024-01-04)
 
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -30,15 +30,21 @@
 - ...
 -->
 
-## Versione X.X.X (dd/mm/yyyy)
+## Versione 7.24.2 (11/01/2024)
+
+### Migliorie
+
+- sitemata la descrizione di una ricorrenza mensile e annuale
+
+## Versione 7.23.0 (28/11/2023)
 
 ### Migliorie
 
 - Aggiornata nuova icona di Twitter
+- Nei template dei feed RSS ora viene mostrata la sorgente se presente.
 
 ### Fix
 
-- Nei template dei feed RSS ora viene mostrata la sorgente se presente.
 - Sistemata sovrapposizione della finestra di selezione blocchi con altri blocchi e con l'header del sito.
 
 ## Versione 7.22.2 (11/10/2023)

diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po
@@ -2726,6 +2726,36 @@ msgstr ""
 msgid "risultati_indagini_customer_satisfaction"
 msgstr ""
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po
@@ -2711,6 +2711,36 @@ msgstr "Rights"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Customer satisfaction survey results"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po
@@ -2720,6 +2720,36 @@ msgstr "Derechos"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Resultados de la encuesta de satisfacción del cliente"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po
@@ -2728,6 +2728,36 @@ msgstr "Droits"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Résultats des enquêtes de satisfaction clients"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po
@@ -2711,6 +2711,36 @@ msgstr "Diritti"
 msgid "risultati_indagini_customer_satisfaction"
 msgstr "Risultati indagini di customer satisfaction"
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr "il giorno"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr " "
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr "il"
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr " "
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr " "
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr " "
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

diff --git a/locales/volto.pot b/locales/volto.pot
@@ -2713,6 +2713,36 @@ msgstr ""
 msgid "risultati_indagini_customer_satisfaction"
 msgstr ""
 
+#: overrideTranslations
+# defaultMessage: il giorno
+msgid "rrule_in"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_nd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: il
+msgid "rrule_on the"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_rd"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_st"
+msgstr ""
+
+#: overrideTranslations
+# defaultMessage: _
+msgid "rrule_th"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate
 #: components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate
 # defaultMessage: No results from RSS feed.

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.24.1",
+  "version": "7.24.2",
   "addons": [
     "@plone-collective/volto-sentry",
     "volto-multilingual-widget",

diff --git a/publiccode.yml b/publiccode.yml
@@ -1,4 +1,4 @@
-# This repository adheres to the publiccode.yml standard by including this 
+# This repository adheres to the publiccode.yml standard by including this
 # metadata file that makes public software easily discoverable.
 # More info at https://github.com/italia/publiccode.yml
 
@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2023-10-11'
+releaseDate: '2024-01-11'
 softwareType: standalone/web
-softwareVersion: 7.22.2
+softwareVersion: 7.24.2
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/Search/Search.jsx b/src/components/ItaliaTheme/Search/Search.jsx
@@ -645,7 +645,6 @@ const Search = () => {
             <Col lg={9} tag="section" className="py-lg-5">
               <div
                 className="search-results-wrapper"
-                role="region"
                 id="search-results-region"
                 aria-live="polite"
               >

diff --git a/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx b/src/components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates.jsx
@@ -39,6 +39,7 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
         forceset: true,
       });
       const RRULE_LANGUAGE = rrulei18n(intl, Moment);
+      console.log(rruleSet.rrules()[0]);
       eventRecurrenceText = rruleSet.rrules()[0]?.toText(
         (t) => {
           return RRULE_LANGUAGE.strings[t];

diff --git a/src/customizations/volto/components/manage/Blocks/HTML/Edit.jsx b/src/customizations/volto/components/manage/Blocks/HTML/Edit.jsx
@@ -259,6 +259,7 @@ class Edit extends Component {
                   aria-label={this.props.intl.formatMessage(messages.source)}
                   active={!this.state.isPreview}
                   onClick={this.onCodeEditor}
+                  type="button"
                 >
                   <Icon name={codeSVG} size="24px" />
                 </Button>
@@ -275,6 +276,7 @@ class Edit extends Component {
                   aria-label={this.props.intl.formatMessage(messages.preview)}
                   active={this.state.isPreview}
                   onClick={this.onPreview}
+                  type="button"
                 >
                   <Icon name={showSVG} size="24px" />
                 </Button>
@@ -290,6 +292,7 @@ class Edit extends Component {
                   basic
                   aria-label={this.props.intl.formatMessage(messages.prettier)}
                   onClick={this.onPrettify}
+                  type="button"
                 >
                   <Icon name={indentSVG} size="24px" />
                 </Button>
@@ -302,7 +305,12 @@ class Edit extends Component {
             <Popup
               trigger={
                 <Button.Group>
-                  <Button icon basic onClick={() => this.onChangeCode('')}>
+                  <Button
+                    icon
+                    basic
+                    type="button"
+                    onClick={() => this.onChangeCode('')}
+                  >
                     <Icon name={clearSVG} size="24px" color="#e40166" />
                   </Button>
                 </Button.Group>

diff --git a/src/overrideTranslations.jsx b/src/overrideTranslations.jsx
@@ -0,0 +1,28 @@
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  rrule_st: {
+    id: 'rrule_st',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_nd: {
+    id: 'rrule_nd',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_rd: {
+    id: 'rrule_rd',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_th: {
+    id: 'rrule_th',
+    defaultMessage: '_', //in italiano non si traduce
+  },
+  rrule_in: {
+    id: 'rrule_in',
+    defaultMessage: 'il giorno',
+  },
+  rrule_on_the: {
+    id: 'rrule_on the',
+    defaultMessage: 'il',
+  },
+});
diff --git a/theme/ItaliaTheme/Components/_search.scss b/theme/ItaliaTheme/Components/_search.scss
@@ -0,0 +1,3 @@
+.search-results-wrapper .ordering-widget .react-select__option--is-focused {
+  background-color: $primary;
+}
diff --git a/theme/bootstrap-override/_bootstrap-italia-site.scss b/theme/bootstrap-override/_bootstrap-italia-site.scss
@@ -180,5 +180,6 @@
 
   // gestione dei focus
   @import 'bootstrap-italia/src/scss/utilities/focus';
+  @import './bootstrap-italia/focus';
   @import 'bootstrap-italia/src/scss/utilities/icons';
 }
diff --git a/theme/bootstrap-override/bootstrap-italia/_focus.scss b/theme/bootstrap-override/bootstrap-italia/_focus.scss
@@ -0,0 +1,3 @@
+.skiplinks .sr-only-focusable:focus {
+  border: 2px solid $focus-outline-color;
+}
diff --git a/theme/site.scss b/theme/site.scss
@@ -111,6 +111,7 @@
 @import 'ItaliaTheme/Components/mobileMenu';
 @import 'ItaliaTheme/Components/relatedItemInEvidence';
 @import 'ItaliaTheme/Components/pageLoader';
+@import 'ItaliaTheme/Components/search';
 
 @import 'ItaliaTheme/Print/all_pages';
 @import 'ItaliaTheme/Print/news_items';