Merge branch 'main' into 11-alpha

RedTurtle · Nov 30, 2023 · cccb46f · cccb46f
2 parents 3e68da2 + 7d8cfbe
commit cccb46f
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,20 @@
 * image size in listing ([397ba93](https://github.com/RedTurtle/design-comuni-plone-theme/commit/397ba932c0742690535c9dd6868cd0bda740f11b))
 * update volto-editablefooter to 5.0.3 ([8fcada1](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8fcada1c5e36e67fd79f3fa99ec9077d0565a661))
 
-## [10.4.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.0.0-alpha.1...v11.0.0-alpha.2) (2023-11-23)
+## [10.4.3](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v10.4.2...v10.4.3) (2023-11-28)
+
+### Bug Fixes
+* 404 page now sends user to homepage instead of search ([#419](https://github.com/RedTurtle/design-comuni-plone-theme/issues/419)) ([4331b59](https://github.com/RedTurtle/design-comuni-plone-theme/commit/4331b5937dbcfad9fe6a22f3f8a0a53c1a17b838))
+* a11y of feedback form ([#418](https://github.com/RedTurtle/design-comuni-plone-theme/issues/418)) ([52da0c7](https://github.com/RedTurtle/design-comuni-plone-theme/commit/52da0c73f67c8bb09b225e19a6535cd6a9613602))
+* changed styles for BandiInEvidenceTemplate for tablet size ([#412](https://github.com/RedTurtle/design-comuni-plone-theme/issues/412)) ([fd7688a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/fd7688a80b6247243730ff01e55dd682ba2edbac))
+* removed pager-link data-element from prev item button in Pagination ([#420](https://github.com/RedTurtle/design-comuni-plone-theme/issues/420)) ([5812546](https://github.com/RedTurtle/design-comuni-plone-theme/commit/58125465349699396b2719a79bf70a339f4ac7e6))
+
+
+### Documentation
+
+* updated publiccode and release log ([33b267f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/33b267f2f20d68b521a1452d300f7288f1d01fb1))
+
+## [10.4.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v10.4.1...v10.4.2) (2023-11-23)
 
 
 ### Bug Fixes
@@ -6085,4 +6098,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - added onclick to viewAll button [`baa258a`](https://github.com/RedTurtle/design-volto-theme/commit/baa258a983f9619b18f9c8d9fb078fe9b17f338b)
 - todo [`7814f01`](https://github.com/RedTurtle/design-volto-theme/commit/7814f01e5dd883c83bca4ecf53425ada9942d9ab)
 - updated gitignore with .history [`e73a28c`](https://github.com/RedTurtle/design-volto-theme/commit/e73a28c94176a172219c1a740a97047b5e2fa400)
-- Added nvmrc [`fd54a3c`](https://github.com/RedTurtle/design-volto-theme/commit/fd54a3cbcf8df22997f036919dfafda870f85db7)
+- Added nvmrc [`fd54a3c`](https://github.com/RedTurtle/design-volto-theme/commit/fd54a3cbcf8df22997f036919dfafda870f85db7)
diff --git a/RELEASE.md b/RELEASE.md
@@ -46,6 +46,17 @@
 ### Novità
 
 - Modificata l'altezza delle immagini delle card, per essere in linea con i template agid.
+## Versione 10.4.3 (28/11/2023)
+
+### Migliorie
+
+- Ora nella pagina 404 "Questa pagina non esiste" viene suggerito il proseguimento della navigazione verso la homepage invece che verso la ricerca.
+
+### Fix
+
+- Migliorata l'accessibilità del modulo di valutazione del sito che si trova in fondo ad ogni pagina.
+- Il blocco Elenco con variazione Bandi viene visualizzato correttamente anche su tablet.
+
 ## Versione 10.4.2 (23/11/2023)
 
 ### Fix

diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po
@@ -2169,6 +2169,11 @@ msgstr ""
 msgid "hide_dates"
 msgstr ""
 
+#: helpers/customizationsI18n
+# defaultMessage: Home page
+msgid "homepage"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HTML/Sidebar
 # defaultMessage: Mostra lo sfondo a tutta larghezza
 msgid "htmlFullWidth"

diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po
@@ -2154,6 +2154,11 @@ msgstr ""
 msgid "hide_dates"
 msgstr ""
 
+#: helpers/customizationsI18n
+# defaultMessage: Home page
+msgid "homepage"
+msgstr "Home page"
+
 #: components/ItaliaTheme/Blocks/HTML/Sidebar
 # defaultMessage: Mostra lo sfondo a tutta larghezza
 msgid "htmlFullWidth"

diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po
@@ -2163,6 +2163,11 @@ msgstr "Para esta plantilla el número de resultados por página debe ser 7. Com
 msgid "hide_dates"
 msgstr "Ocultar fechas"
 
+#: helpers/customizationsI18n
+# defaultMessage: Home page
+msgid "homepage"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HTML/Sidebar
 # defaultMessage: Mostra lo sfondo a tutta larghezza
 msgid "htmlFullWidth"

diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po
@@ -2171,6 +2171,11 @@ msgstr ""
 msgid "hide_dates"
 msgstr ""
 
+#: helpers/customizationsI18n
+# defaultMessage: Home page
+msgid "homepage"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HTML/Sidebar
 # defaultMessage: Mostra lo sfondo a tutta larghezza
 msgid "htmlFullWidth"

diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po
@@ -2154,6 +2154,11 @@ msgstr "Per questo template il numero di risultati per pagina deve essere 7. Con
 msgid "hide_dates"
 msgstr "Nascondi le date"
 
+#: helpers/customizationsI18n
+# defaultMessage: Home page
+msgid "homepage"
+msgstr "Home page"
+
 #: components/ItaliaTheme/Blocks/HTML/Sidebar
 # defaultMessage: Mostra lo sfondo a tutta larghezza
 msgid "htmlFullWidth"

diff --git a/locales/volto.pot b/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2023-11-22T09:06:53.905Z\n"
+"POT-Creation-Date: 2023-11-30T09:45:03.284Z\n"
 "Last-Translator: Plone i18n <[email protected]>\n"
 "Language-Team: Plone i18n <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -2156,6 +2156,11 @@ msgstr ""
 msgid "hide_dates"
 msgstr ""
 
+#: helpers/customizationsI18n
+# defaultMessage: Home page
+msgid "homepage"
+msgstr ""
+
 #: components/ItaliaTheme/Blocks/HTML/Sidebar
 # defaultMessage: Mostra lo sfondo a tutta larghezza
 msgid "htmlFullWidth"

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: '2023-11-23'
+releaseDate: '2023-11-28'
 softwareType: standalone/web
-softwareVersion: 10.4.2
+softwareVersion: 10.4.3
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/CustomerSatisfaction/FeedbackForm.jsx b/src/components/ItaliaTheme/CustomerSatisfaction/FeedbackForm.jsx
@@ -214,7 +214,7 @@ const FeedbackForm = ({ contentType, pathname }) => {
       <Container>
         <Row className="d-flex justify-content-center bg-primary">
           <Col className="col-12 col-lg-6">
-            <div className="feedback-form">
+            <div className="feedback-form" role="form">
               <Card
                 className="shadow card-wrapper py-4 px-4"
                 data-element="feedback"

diff --git a/src/components/ItaliaTheme/CustomerSatisfaction/Steps/AnswersStep.jsx b/src/components/ItaliaTheme/CustomerSatisfaction/Steps/AnswersStep.jsx
@@ -82,20 +82,20 @@ const AnswersStep = ({
           {state?.map((s, i) => (
             <FormGroup
               check
-              key={s}
+              key={'positive-' + s}
               className="border-bottom border-light mb-4"
             >
               <Input
-                name={s}
-                id={s}
+                name="answer-input-positive"
+                id={'positive-' + s}
                 type="radio"
                 checked={s === selectedAnswer}
                 value={s}
                 onChange={handleAnswerChange}
                 addon
               />
               <Label
-                for={s}
+                for={'positive-' + s}
                 check
                 className="mb-4"
                 data-element="feedback-rating-answer"
@@ -129,20 +129,20 @@ const AnswersStep = ({
           {state?.map((s, i) => (
             <FormGroup
               check
-              key={s}
+              key={'negative-' + s}
               className="border-bottom border-light mb-4"
             >
               <Input
-                name={s}
-                id={s}
+                name="answer-input-negative"
+                id={'negative-' + s}
                 type="radio"
                 checked={s === selectedAnswer}
                 value={s}
                 onChange={handleAnswerChange}
                 addon
               />
               <Label
-                for={s}
+                for={'negative-' + s}
                 check
                 className="mb-4"
                 data-element="feedback-rating-answer"

diff --git a/src/components/ItaliaTheme/Pagination/PaginationItem.jsx b/src/components/ItaliaTheme/Pagination/PaginationItem.jsx
@@ -76,7 +76,9 @@ class PaginationItem extends Component {
           onClick={this.handleClick}
           onKeyDown={this.handleKeyDown}
           aria-current={active ? 'page' : null}
-          data-element={isServiceLink ? 'pager-link' : null}
+          data-element={
+            isServiceLink && type !== 'prevItem' ? 'pager-link' : null
+          }
         >
           {type === 'prevItem' && (
             <>

diff --git a/src/customizations/volto/components/theme/NotFound/NotFound.jsx b/src/customizations/volto/components/theme/NotFound/NotFound.jsx
@@ -1,6 +1,6 @@
 /*
 CUSTOMIZATIONS:
-- Removed the "Site Administration" link, added a link to the search page
+- Removed the "Site Administration" link, added a link to the home page
 */
 
 import { useEffect } from 'react';
@@ -22,14 +22,13 @@ const NotFound = () => {
   const dispatch = useDispatch();
   const lang = useSelector((state) => state.intl.locale);
 
+  const navigationRootPath = config.settings.isMultilingual
+    ? `/${toBackendLang(lang)}`
+    : '/';
+
   useEffect(() => {
-    dispatch(
-      getNavigation(
-        config.settings.isMultilingual ? `/${toBackendLang(lang)}` : '/',
-        config.settings.navDepth,
-      ),
-    );
-  }, [dispatch, lang]);
+    dispatch(getNavigation(navigationRootPath, config.settings.navDepth));
+  }, [dispatch, lang, navigationRootPath]);
 
   return (
     <Container className="view-wrapper">
@@ -47,8 +46,8 @@ const NotFound = () => {
         />
       </p>
       <p>
-        <Link to="/search">
-          <FormattedMessage id="Search Site" defaultMessage="Search Site" />
+        <Link to={navigationRootPath}>
+          <FormattedMessage id="Home page" defaultMessage="Home page" />
         </Link>
       </p>
       {/* <p>

diff --git a/src/helpers/customizationsI18n.js b/src/helpers/customizationsI18n.js
@@ -5,4 +5,8 @@ defineMessages({
     id: 'opensInNewTab',
     defaultMessage: 'Opens in new tab',
   },
+  homepage: {
+    id: 'homepage',
+    defaultMessage: 'Home page',
+  },
 });
diff --git a/src/theme/ItaliaTheme/Blocks/_bandiInEvidenceTemplate.scss b/src/theme/ItaliaTheme/Blocks/_bandiInEvidenceTemplate.scss
@@ -5,6 +5,10 @@
     gap: 1.3rem;
     -ms-grid-columns: 1fr 1.3rem 1fr 1.3rem 1fr;
     grid-template-columns: 1fr 1fr 1fr;
+
+    .read-more a.read-more {
+      flex-direction: row;
+    }
   }
 
   .card-wrapper {
@@ -39,7 +43,7 @@
   }
 
   // smartphone
-  @media (max-width: 585px) {
+  @media (max-width: #{map-get($grid-breakpoints, sm)}) {
     .bandi-in-evidence-cards-wrapper {
       .card-wrapper {
         width: 100%;
@@ -51,13 +55,17 @@
   }
 
   // tablet
-  @media (min-width: 586px) and (max-width: 1367px) {
-    .bandi-in-evidence-cards-wrapper {
+  .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;
+    }
 
-      div.read-more a.read-more {
-        flex-direction: row;
-      }
+    @media (min-width: #{map-get($grid-breakpoints, md)}) and (max-width: #{map-get($grid-breakpoints, lg)}) {
+      gap: 1rem;
+    }
+
+    @media (min-width: #{map-get($grid-breakpoints, sm)}) and (max-width: #{map-get($grid-breakpoints, md)}) {
+      display: block !important;
     }
   }
 
@@ -111,9 +119,8 @@
       bottom: 0;
       padding-top: 0.75rem;
 
-      @media (max-width: 585px) {
+      @media (max-width: #{map-get($grid-breakpoints, sm)}) {
         display: flex;
-        flex-direction: row;
         align-items: center;
         color: $analogue-1-a7;
         font-size: 0.77778rem;
@@ -122,7 +129,7 @@
         text-transform: uppercase;
       }
     }
-    @media (max-width: 585px) {
+    @media (max-width: #{map-get($grid-breakpoints, sm)}) {
       margin-top: 0;
     }
   }

diff --git a/src/theme/ItaliaTheme/Components/_customerSatisfaction.scss b/src/theme/ItaliaTheme/Components/_customerSatisfaction.scss
@@ -10,6 +10,11 @@
     max-height: 800px;
   }
 
+  .feedback-form #vf-more-positive[aria-hidden='true'],
+  .feedback-form #vf-more-negative[aria-hidden='true'] {
+    visibility: hidden;
+  }
+
   .feedback-form {
     padding: 2rem 0;
     margin: 0;
@@ -28,6 +33,14 @@
 
     .rating-container {
       padding-bottom: 0;
+
+      input.volto-feedback-rating:focus + label {
+        border: 0;
+        box-shadow:
+          0 0 0.2rem $focus-outline-color,
+          0 0 0 0.2rem $focus-outline-color !important;
+        outline: none;
+      }
     }
 
     .form-check label {