diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml new file mode 100644 index 000000000..f6867aad7 --- /dev/null +++ b/.github/workflows/performance.yml @@ -0,0 +1,47 @@ +name: Docker build for latest performance test version +on: + push: + branches: [performance] + +jobs: + build_develop: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push Docker images + uses: docker/build-push-action@v4 + with: + context: . + file: ./dockerfiles/Dockerfile + tags: redturtletech/io-comune-base:perf + pull: true + push: true + cache-from: type=registry,ref=redturtletech/io-comune-base:perf + cache-to: type=inline + build-args: | + ADDON_NAME=design-comuni-plone-theme + ADDON_PATH=design-comuni-plone-theme + VOLTO_VERSION=17.7.0 + + - name: Deploy to rancher + uses: redturtle/rancher-deploy-action@v0.2.0 + with: + host: ${{ secrets.RANCHER_HOST }} + api-username: ${{ secrets.RANCHER_API_USERNAME }} + api-password: ${{ secrets.RANCHER_API_PASSWORD }} + cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }} + project-id: ${{ secrets.RANCHER_PROJECT_ID }} + namespace: ${{ secrets.RANCHER_NAMESPACE_DEVELOP }} + workload: ${{ secrets.RANCHER_WORKLOAD_PERF }} + image: redturtletech/io-comune-base:perf + slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }} diff --git a/CHANGELOG.md b/CHANGELOG.md index fc2bce8eb..735332f57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,52 @@ +## [11.9.1](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.9.0...v11.9.1) (2024-04-03) + + +### Bug Fixes + +* missing message id in navigation customization ([7183f75](https://github.com/redturtle/design-comuni-plone-theme/commit/7183f75f812b387469f8cd15037811d907c0181d)) + + +### Documentation + +* updated publiccode and release log ([c05ece3](https://github.com/redturtle/design-comuni-plone-theme/commit/c05ece3acec39bcc0f43f116ff3b994666f344d5)) + +## [11.9.0](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.8.1...v11.9.0) (2024-04-03) + + +### Features + +* added new AttachmentCardTemplate listing variation ([#603](https://github.com/redturtle/design-comuni-plone-theme/issues/603)) ([26ae362](https://github.com/redturtle/design-comuni-plone-theme/commit/26ae36219955b785d994815f8c041e4c54f7889f)) +* added ppt icon file format ([#615](https://github.com/redturtle/design-comuni-plone-theme/issues/615)) ([4e5c352](https://github.com/redturtle/design-comuni-plone-theme/commit/4e5c352e783c969a12b626ecb4fd356863192369)) + + +### Bug Fixes + +* added aria label to icons across ioComune ([#557](https://github.com/redturtle/design-comuni-plone-theme/issues/557)) ([a33c93b](https://github.com/redturtle/design-comuni-plone-theme/commit/a33c93b0b414e7cfb0b6b7344c799070a14f92ea)) +* added aria-hidden attribute to icons ([#594](https://github.com/redturtle/design-comuni-plone-theme/issues/594)) ([e736bed](https://github.com/redturtle/design-comuni-plone-theme/commit/e736bed0a399aecd6ec2f399c1c5c70f1192509b)) +* added role='button' to search link ([#611](https://github.com/redturtle/design-comuni-plone-theme/issues/611)) ([32a008a](https://github.com/redturtle/design-comuni-plone-theme/commit/32a008a8dbf0516ff344e7f3579f643546db4acd)) +* added styles to spread out card-image-wrapper div ([#614](https://github.com/redturtle/design-comuni-plone-theme/issues/614)) ([661ba6e](https://github.com/redturtle/design-comuni-plone-theme/commit/661ba6ec6ee732127a4b1d76caf85869266221a7)) +* alt defaults to item.title for CompleteBlockLinksTemplate for accessibility ([#617](https://github.com/redturtle/design-comuni-plone-theme/issues/617)) ([669dfff](https://github.com/redturtle/design-comuni-plone-theme/commit/669dfffc42b3b9956396e6d00ee676bdfe798017)) +* aria-label in calendar block controls ([#620](https://github.com/redturtle/design-comuni-plone-theme/issues/620)) ([1c7bd5c](https://github.com/redturtle/design-comuni-plone-theme/commit/1c7bd5ccac6b08ee4dad6e56af4edec15c422f40)) +* footer logo responsive height ([#621](https://github.com/redturtle/design-comuni-plone-theme/issues/621)) ([282eef7](https://github.com/redturtle/design-comuni-plone-theme/commit/282eef72f5caea46f4c40f1a24529b2725193ce3)) +* p instead of headings in BrandText for a11y ([#616](https://github.com/redturtle/design-comuni-plone-theme/issues/616)) ([6b2a26d](https://github.com/redturtle/design-comuni-plone-theme/commit/6b2a26dd3d5206bff141c39945bf6792479dbb83)) +* remove dangerouslySetInnerHTML from ContactLink ([#601](https://github.com/redturtle/design-comuni-plone-theme/issues/601)) ([2e5d7f9](https://github.com/redturtle/design-comuni-plone-theme/commit/2e5d7f9b5a714b3560e790e5fab9f0cc232d832c)) +* remove icon from Organizzatori eventi card ([#628](https://github.com/redturtle/design-comuni-plone-theme/issues/628)) ([4acc74f](https://github.com/redturtle/design-comuni-plone-theme/commit/4acc74fff73d736ab743f08962bb0d76c6138302)) +* reset of search blocks results ([#625](https://github.com/redturtle/design-comuni-plone-theme/issues/625)) ([17048e2](https://github.com/redturtle/design-comuni-plone-theme/commit/17048e25cd467579118519d8789567b69207394e)) +* sovrapposizione etichetta card nastro ([#409](https://github.com/redturtle/design-comuni-plone-theme/issues/409)) ([b57f290](https://github.com/redturtle/design-comuni-plone-theme/commit/b57f290e91da06e57e04e60f892846bba0c060e4)) +* string formatting for modified date ([#608](https://github.com/redturtle/design-comuni-plone-theme/issues/608)) ([cc43200](https://github.com/redturtle/design-comuni-plone-theme/commit/cc43200b7bee1444f5149f8e280b25034a835c4f)) +* translated aria-label of menu hamburger icon ([#591](https://github.com/redturtle/design-comuni-plone-theme/issues/591)) ([c822363](https://github.com/redturtle/design-comuni-plone-theme/commit/c8223631086d310e3538d26586b831bae174df94)) +* translation id typo ([#622](https://github.com/redturtle/design-comuni-plone-theme/issues/622)) ([5cc5056](https://github.com/redturtle/design-comuni-plone-theme/commit/5cc5056ecd95bda25940321c8037a0ca0a29361a)) +* updated volto-editable-footer to fix view sidebar in edit config ([#623](https://github.com/redturtle/design-comuni-plone-theme/issues/623)) ([ae82478](https://github.com/redturtle/design-comuni-plone-theme/commit/ae824782dbe201ac3c3c501202b316b4b0ae975e)) +* updated volto-form-block ([#613](https://github.com/redturtle/design-comuni-plone-theme/issues/613)) ([0d7e84b](https://github.com/redturtle/design-comuni-plone-theme/commit/0d7e84b7eb7c24cb4fe850ccd69e9b0749ab86b5)) +* view Listing blocks inside Grid block ([#626](https://github.com/redturtle/design-comuni-plone-theme/issues/626)) ([c5549a7](https://github.com/redturtle/design-comuni-plone-theme/commit/c5549a7285822df258b53f88ad3c53bcbf3c00aa)) + + +### Documentation + +* updated publiccode and release log ([d9adb4a](https://github.com/redturtle/design-comuni-plone-theme/commit/d9adb4a8ee896258244c3fd7f9b4198288c64892)) + ## [11.8.1](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.8.0...v11.8.1) (2024-03-26) diff --git a/RELEASE.md b/RELEASE.md index 0815b80de..1baf973ff 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -45,18 +45,44 @@ ### Migliorie -- Migliorata l'accessibilità del bottone "Ricerca". -- Migliorata l'accessibilità del blocco Icone. +- Aggiunta la possibilità di inserire testo nel filtro luogo nel blocco Ricerca Eventi. +- Le opzioni del menu a tendina per il filtro luogo nel blocco Ricerca Eventi sono ordinate alfabeticamente. +- Il focus quando un elemento (link o pulsante) è cliccato con il mouse non ha più il bordo giallo/arancione. +- Migliorati gli stili per la stampa del CT pagina. ### Novità - Ora i link in testata nell'header slim sono configurabili da pannello di controllo - Aggiunto una nuova variazione del blocco elenco "Allegati" che permette di scaricare oggetti di tipo File o aprire l'anteprima di file PDF. +- ... + +### Fix + +- Aggiunto il titolo per la sezione "Organizzatore esterno" quando il campo è compilato nel tipo di contenuto Evento. + +## Versione 11.9.1 (03/04/2024) + +### Fix + +- Risolto un problema dovuto all'assenza di una id specifico nelle traduzioni. + +## Versione 11.9.0 (03/04/2024) + +### Migliorie + +- Effettuate diverse migliorie di accessibilità. + +### Novità + +- Aggiunta una nuova variazione del blocco elenco "Allegati" che permette di scaricare oggetti di tipo File o aprire l'anteprima di file PDF. ### Fix -- L'etichetta della Card con Nastro (Blocco Elenco) non si sovrappone più all'immagine del nastro. -- Aggiustato il layout della card per il CT persone quando è impostata un'immagine. +- Sistemata la visualizzazione dei blocchi elenco all'interno del blocco griglia. +- L'etichetta della Card con Nastro (Blocco Elenco) non si sovrappone più all'icona del nastro. +- Aggiustato il layout della card per le persone quando è impostata un'immagine. +- Sistemato bug su blocchi di ricerca Bandi, Eventi e UO nei quali rimanevano memorizzati i risultati di ricerca anche abbandonando la pagina. +- Tradotto il messaggio per Screen Reader del bottone per aprire e chiudere il menu in mobile. ## Versione 11.8.0 (19/03/2024) diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po index a390876f4..a99f1c809 100644 --- a/locales/de/LC_MESSAGES/volto.po +++ b/locales/de/LC_MESSAGES/volto.po @@ -2260,11 +2260,6 @@ msgstr "" msgid "icona_luoghi" msgstr "" -#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno -# defaultMessage: Icona telefono -msgid "icona_telefono" -msgstr "" - #: components/ItaliaTheme/View/Commons/OfficeCard # defaultMessage: Icona ufficio msgid "icona_ufficio" @@ -2748,6 +2743,11 @@ msgstr "" msgid "organizzato_da" msgstr "" +#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno +# defaultMessage: Organizzatore +msgid "organizzatore" +msgstr "" + #: components/ItaliaTheme/View/Commons/TrasparenzaFields #: components/ItaliaTheme/View/TrasparenzaView/DettagliProcedimentiView # defaultMessage: Organo competente adozione provvedimento finale @@ -3963,6 +3963,21 @@ msgstr "" msgid "to" msgstr "" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po index ef6faef15..c8b7bffef 100644 --- a/locales/en/LC_MESSAGES/volto.po +++ b/locales/en/LC_MESSAGES/volto.po @@ -2245,11 +2245,6 @@ msgstr "Icon for {topic_title} topic" msgid "icona_luoghi" msgstr "Venues icon" -#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno -# defaultMessage: Icona telefono -msgid "icona_telefono" -msgstr "Phone icon" - #: components/ItaliaTheme/View/Commons/OfficeCard # defaultMessage: Icona ufficio msgid "icona_ufficio" @@ -2731,7 +2726,12 @@ msgstr "Order by" #: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreInterno # defaultMessage: Organizzato da msgid "organizzato_da" -msgstr "" +msgstr "Organized by" + +#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno +# defaultMessage: Organizzatore +msgid "organizzatore" +msgstr "Organizer" #: components/ItaliaTheme/View/Commons/TrasparenzaFields #: components/ItaliaTheme/View/TrasparenzaView/DettagliProcedimentiView @@ -3948,6 +3948,21 @@ msgstr "title" msgid "to" msgstr "to" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "{action} the menu" + +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "Close" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "Open" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po index 981bb5564..23f59429d 100644 --- a/locales/es/LC_MESSAGES/volto.po +++ b/locales/es/LC_MESSAGES/volto.po @@ -2254,11 +2254,6 @@ msgstr "" msgid "icona_luoghi" msgstr "" -#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno -# defaultMessage: Icona telefono -msgid "icona_telefono" -msgstr "" - #: components/ItaliaTheme/View/Commons/OfficeCard # defaultMessage: Icona ufficio msgid "icona_ufficio" @@ -2742,6 +2737,11 @@ msgstr "Ordenado por" msgid "organizzato_da" msgstr "" +#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno +# defaultMessage: Organizzatore +msgid "organizzatore" +msgstr "" + #: components/ItaliaTheme/View/Commons/TrasparenzaFields #: components/ItaliaTheme/View/TrasparenzaView/DettagliProcedimentiView # defaultMessage: Organo competente adozione provvedimento finale @@ -3957,6 +3957,21 @@ msgstr "título" msgid "to" msgstr "a" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po index e92c08aa2..e5ca646bd 100644 --- a/locales/fr/LC_MESSAGES/volto.po +++ b/locales/fr/LC_MESSAGES/volto.po @@ -2262,11 +2262,6 @@ msgstr "" msgid "icona_luoghi" msgstr "" -#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno -# defaultMessage: Icona telefono -msgid "icona_telefono" -msgstr "" - #: components/ItaliaTheme/View/Commons/OfficeCard # defaultMessage: Icona ufficio msgid "icona_ufficio" @@ -2750,6 +2745,11 @@ msgstr "Trier par" msgid "organizzato_da" msgstr "" +#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno +# defaultMessage: Organizzatore +msgid "organizzatore" +msgstr "" + #: components/ItaliaTheme/View/Commons/TrasparenzaFields #: components/ItaliaTheme/View/TrasparenzaView/DettagliProcedimentiView # defaultMessage: Organo competente adozione provvedimento finale @@ -3965,6 +3965,21 @@ msgstr "titre" msgid "to" msgstr "au" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po index 9c47e9621..f34fb7d60 100644 --- a/locales/it/LC_MESSAGES/volto.po +++ b/locales/it/LC_MESSAGES/volto.po @@ -2245,11 +2245,6 @@ msgstr "" msgid "icona_luoghi" msgstr "" -#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno -# defaultMessage: Icona telefono -msgid "icona_telefono" -msgstr "" - #: components/ItaliaTheme/View/Commons/OfficeCard # defaultMessage: Icona ufficio msgid "icona_ufficio" @@ -2733,6 +2728,11 @@ msgstr "Ordina per" msgid "organizzato_da" msgstr "Organizzato da" +#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno +# defaultMessage: Organizzatore +msgid "organizzatore" +msgstr "" + #: components/ItaliaTheme/View/Commons/TrasparenzaFields #: components/ItaliaTheme/View/TrasparenzaView/DettagliProcedimentiView # defaultMessage: Organo competente adozione provvedimento finale @@ -3948,6 +3948,21 @@ msgstr "titolo" msgid "to" msgstr "al" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/locales/volto.pot b/locales/volto.pot index dc2b876cf..a4a47e9e8 100644 --- a/locales/volto.pot +++ b/locales/volto.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plone\n" -"POT-Creation-Date: 2024-03-27T15:08:22.683Z\n" +"POT-Creation-Date: 2024-04-03T13:54:10.953Z\n" "Last-Translator: Plone i18n \n" "Language-Team: Plone i18n \n" "MIME-Version: 1.0\n" @@ -2247,11 +2247,6 @@ msgstr "" msgid "icona_luoghi" msgstr "" -#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno -# defaultMessage: Icona telefono -msgid "icona_telefono" -msgstr "" - #: components/ItaliaTheme/View/Commons/OfficeCard # defaultMessage: Icona ufficio msgid "icona_ufficio" @@ -2735,6 +2730,11 @@ msgstr "" msgid "organizzato_da" msgstr "" +#: components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno +# defaultMessage: Organizzatore +msgid "organizzatore" +msgstr "" + #: components/ItaliaTheme/View/Commons/TrasparenzaFields #: components/ItaliaTheme/View/TrasparenzaView/DettagliProcedimentiView # defaultMessage: Organo competente adozione provvedimento finale @@ -3285,7 +3285,7 @@ msgid "search_startDate" msgstr "" #: helpers/Translations/searchBlockExtendedTranslations -# defaultMessage: Ricerca per: {searchedtext}. +# defaultMessage: Ricerca per: {searchedtext}. msgid "searchedFor" msgstr "" @@ -3950,6 +3950,21 @@ msgstr "" msgid "to" msgstr "" +#: overrideTranslations +# defaultMessage: {action} il menu +msgid "toggle-menu" +msgstr "" + +#: overrideTranslations +# defaultMessage: Chiudi +msgid "toggleMenu_close" +msgstr "" + +#: overrideTranslations +# defaultMessage: Apri +msgid "toggleMenu_open" +msgstr "" + #: components/ItaliaTheme/Header/HeaderSearch/SearchModal #: components/ItaliaTheme/Search/Search #: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderTassonomiaArgomenti diff --git a/package.json b/package.json index 9d9be86fb..6278d9ea4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "design-comuni-plone-theme", "description": "Volto Theme for Italia design guidelines", "license": "GPL-v3", - "version": "11.8.1", + "version": "11.9.1", "main": "src/index.js", "keywords": [ "volto-addon", @@ -145,7 +145,7 @@ "volto-blocks-widget": "3.4.0", "volto-data-grid-widget": "2.3.1", "volto-dropdownmenu": "4.1.1", - "volto-editablefooter": "5.1.0", + "volto-editablefooter": "5.1.1", "volto-feedback": "0.3.0", "volto-form-block": "3.7.2", "volto-gdpr-privacy": "2.1.1", diff --git a/publiccode.yml b/publiccode.yml index 2bd9fccf3..181ea56ea 100644 --- 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-03-26' +releaseDate: '2024-04-03' softwareType: standalone/web -softwareVersion: 11.8.1 +softwareVersion: 11.9.1 url: 'https://github.com/italia/design-comuni-plone-theme' usedBy: - ASP Comuni Modenesi Area Nord diff --git a/src/actions/index.js b/src/actions/index.js index c563bcc8b..4c7e4676c 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -14,7 +14,7 @@ import { getSearchFilters, GET_SEARCH_FILTERS } from './getSearchFilters'; import { getSearchResults, GET_SEARCH_RESULTS } from './getSearchResults'; import { getCalendarResults, GET_CALENDAR_RESULTS } from './calendarSearch'; - +import { resetQuerystringResults } from './resetQuerystringResults'; import { setOriginalQuery, ORIGINAL_QUERY } from './setOriginalQuery'; import { @@ -61,4 +61,5 @@ export { ORIGINAL_QUERY, getSearchBandiFilters, GET_SEARCH_BANDI_FILTERS, + resetQuerystringResults, }; diff --git a/src/actions/resetQuerystringResults.js b/src/actions/resetQuerystringResults.js new file mode 100644 index 000000000..7ef3e3c66 --- /dev/null +++ b/src/actions/resetQuerystringResults.js @@ -0,0 +1,18 @@ +/* +- il reducer del type RESET_QUERYSTRING_RESULTS viene già dichiarato in Volto nel file reducers/querystringsearch/querystringsearch.js +*/ + +export const RESET_QUERYSTRING_RESULTS = 'RESET_QUERYSTRING_RESULTS'; + +/** + * Reset querystring results function. + * @function resetQuerystringResults + * @param {string} subrequest Key of the subrequest. + * @returns {Object} Search content action. + */ +export function resetQuerystringResults(subrequest = null) { + return { + type: RESET_QUERYSTRING_RESULTS, + subrequest, + }; +} diff --git a/src/components/ItaliaTheme/AppExtras/TrackFocus.jsx b/src/components/ItaliaTheme/AppExtras/TrackFocus.jsx new file mode 100644 index 000000000..0db5400fe --- /dev/null +++ b/src/components/ItaliaTheme/AppExtras/TrackFocus.jsx @@ -0,0 +1,47 @@ +import React, { useEffect, useRef } from 'react'; + +const DATA_FOCUS_MOUSE = 'data-focus-mouse'; +const CLASS_NAME_MOUSE_FOCUS = 'focus--mouse'; + +const TrackFocus = () => { + const usingMouse = useRef(false); + + useEffect(() => { + const handleEvent = (e) => { + usingMouse.current = e.type === 'mousedown'; + }; + const handleFocusChange = (e) => { + if (e.target) { + if (usingMouse.current) { + e.target.classList.add(CLASS_NAME_MOUSE_FOCUS); + e.target.setAttribute(DATA_FOCUS_MOUSE, true); + } else { + e.target.classList.remove(CLASS_NAME_MOUSE_FOCUS); + e.target.removeAttribute(DATA_FOCUS_MOUSE); + } + } + }; + const handleFocusOut = (e) => { + if (e.target) { + e.target.classList.remove(CLASS_NAME_MOUSE_FOCUS); + e.target.removeAttribute(DATA_FOCUS_MOUSE); + } + }; + + document.addEventListener('keydown', handleEvent); + document.addEventListener('mousedown', handleEvent); + document.addEventListener('focusin', handleFocusChange); + document.addEventListener('focusout', handleFocusOut); + + return () => { + document.removeEventListener('keydown', handleEvent); + document.removeEventListener('mousedown', handleEvent); + document.removeEventListener('focusin', handleFocusChange); + document.removeEventListener('focusout', handleFocusOut); + }; + }, []); + + return null; +}; + +export default TrackFocus; diff --git a/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx b/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx index b12cef130..2c807e508 100644 --- a/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx +++ b/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx @@ -9,7 +9,7 @@ import { getQueryStringResults } from '@plone/volto/actions'; import { flattenToAppURL } from '@plone/volto/helpers'; import BandiInEvidenceTemplate from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/BandiInEvidenceTemplate'; import { Pagination } from 'design-comuni-plone-theme/components/ItaliaTheme'; - +import { resetQuerystringResults } from 'design-comuni-plone-theme/actions'; import FiltersConfig from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/BandiSearch/FiltersConfig'; const messages = defineMessages({ @@ -32,7 +32,7 @@ const messages = defineMessages({ }, }); -const Body = ({ data, inEditMode, path, onChangeBlock }) => { +const Body = ({ data, id, inEditMode, path, onChangeBlock }) => { const intl = useIntl(); const b_size = 6; @@ -44,14 +44,19 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { const dispatch = useDispatch(); const querystringResults = useSelector((state) => { - return state.querystringsearch?.subrequests?.bandi_search; + return state.querystringsearch?.subrequests?.[id + '_bandi_search']; }); const items = useSelector((state) => { - return state.querystringsearch?.subrequests?.bandi_search?.items ?? []; + return ( + state.querystringsearch?.subrequests?.[id + '_bandi_search']?.items ?? [] + ); }); const loading = useSelector((state) => { - return state.querystringsearch?.subrequests?.bandi_search?.loading || false; + return ( + state.querystringsearch?.subrequests?.[id + '_bandi_search']?.loading || + false + ); }); const resultsRef = createRef(); @@ -92,7 +97,7 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { sort_on: data.sort_on, sort_order: data.sort_order ? 'descending' : 'ascending', }, - 'bandi_search', + id + '_bandi_search', page, ), ); @@ -112,6 +117,7 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { newState = { ...getInitialState(), }; + dispatch(resetQuerystringResults(id + '_bandi_search')); } else { const f = newState[action.filter]; const defaultReducer = (value, state) => value; diff --git a/src/components/ItaliaTheme/Blocks/BandiSearch/Edit.jsx b/src/components/ItaliaTheme/Blocks/BandiSearch/Edit.jsx index d8f1e5071..7495a50a2 100644 --- a/src/components/ItaliaTheme/Blocks/BandiSearch/Edit.jsx +++ b/src/components/ItaliaTheme/Blocks/BandiSearch/Edit.jsx @@ -14,7 +14,7 @@ const messages = defineMessages({ }, }); -const Edit = ({ data, block, onChangeBlock, selected, pathname }) => { +const Edit = ({ data, id, block, onChangeBlock, selected, pathname }) => { const intl = useIntl(); return ( @@ -24,6 +24,7 @@ const Edit = ({ data, block, onChangeBlock, selected, pathname }) => { )} {
{ ); diff --git a/src/components/ItaliaTheme/Blocks/Common/SearchFilters/SelectFilter.jsx b/src/components/ItaliaTheme/Blocks/Common/SearchFilters/SelectFilter.jsx index c34deec02..474335694 100644 --- a/src/components/ItaliaTheme/Blocks/Common/SearchFilters/SelectFilter.jsx +++ b/src/components/ItaliaTheme/Blocks/Common/SearchFilters/SelectFilter.jsx @@ -4,7 +4,14 @@ import { SelectInput } from 'design-comuni-plone-theme/components'; import { useDispatch, useSelector } from 'react-redux'; import { searchContent, getVocabulary } from '@plone/volto/actions'; -const SelectFilter = ({ options, value, id, onChange, placeholder }) => { +const SelectFilter = ({ + options, + value, + id, + onChange, + placeholder, + isSearchable = false, +}) => { const dispatch = useDispatch(); const state = useSelector((state) => { @@ -64,6 +71,7 @@ const SelectFilter = ({ options, value, id, onChange, placeholder }) => { }} options={select_options?.filter((opt) => !!opt.value?.toString()) ?? []} isClearable={true} + isSearchable={isSearchable} // components={{ // ClearIndicator: (props) => { // const { diff --git a/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx b/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx index 2e912e6e5..d1c4dcd23 100644 --- a/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx +++ b/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx @@ -9,7 +9,7 @@ import { getQueryStringResults } from '@plone/volto/actions'; import { flattenToAppURL } from '@plone/volto/helpers'; import CardWithImageTemplate from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/Listing/CardWithImageTemplate'; import { Pagination } from 'design-comuni-plone-theme/components/ItaliaTheme'; - +import { resetQuerystringResults } from 'design-comuni-plone-theme/actions'; import FiltersConfig from 'design-comuni-plone-theme/components/ItaliaTheme/Blocks/EventSearch/FiltersConfig'; const messages = defineMessages({ @@ -32,7 +32,7 @@ const messages = defineMessages({ }, }); -const Body = ({ data, inEditMode, path, onChangeBlock }) => { +const Body = ({ data, id, inEditMode, path, onChangeBlock }) => { const intl = useIntl(); const b_size = 6; @@ -44,22 +44,25 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { const dispatch = useDispatch(); const querystringResults = useSelector((state) => { - return state.querystringsearch?.subrequests?.events_search; + return state.querystringsearch?.subrequests?.[id + '_events_search']; }); const items = useSelector((state) => { - return state.querystringsearch?.subrequests?.events_search?.items ?? []; + return ( + state.querystringsearch?.subrequests?.[id + '_events_search']?.items ?? [] + ); }); const loading = useSelector((state) => { return ( - state.querystringsearch?.subrequests?.events_search?.loading || false + state.querystringsearch?.subrequests?.[id + '_events_search']?.loading || + false ); }); const firstLoading = useSelector((state) => { return ( - !state.querystringsearch?.subrequests?.events_search?.loading && - !state.querystringsearch?.subrequests?.events_search?.loaded + !state.querystringsearch?.subrequests?.[id + '_events_search']?.loading && + !state.querystringsearch?.subrequests?.[id + '_events_search']?.loaded ); }); @@ -99,7 +102,7 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { query: query, b_size: b_size, }, - 'events_search', + id + '_events_search', page, ), ); @@ -123,6 +126,7 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { newState = { ...getInitialState(), }; + dispatch(resetQuerystringResults(id + '_events_search')); } else { const f = newState[action.filter]; const defaultReducer = (value, state) => value; diff --git a/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js b/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js index 75162dce8..6ecdf1179 100644 --- a/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js +++ b/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js @@ -65,6 +65,7 @@ const DefaultFilters = () => { component: SelectFilter, props: { value: null, + isSearchable: true, options: { dispatch: { path: subsite ? flattenToAppURL(subsite['@id']) : '/', @@ -72,6 +73,10 @@ const DefaultFilters = () => { fullobjects: 0, b_size: 10000, subrequests_name: 'venues', + additionalParams: { + sort_on: 'sortable_title', + sort_order: 'ascending', + }, }, placeholder: intl.formatMessage(messages.venues), }, diff --git a/src/components/ItaliaTheme/Blocks/EventSearch/Edit.jsx b/src/components/ItaliaTheme/Blocks/EventSearch/Edit.jsx index f7749ccbc..dd175a093 100644 --- a/src/components/ItaliaTheme/Blocks/EventSearch/Edit.jsx +++ b/src/components/ItaliaTheme/Blocks/EventSearch/Edit.jsx @@ -14,7 +14,7 @@ const messages = defineMessages({ }, }); -const Edit = ({ data, block, onChangeBlock, selected, pathname }) => { +const Edit = ({ data, id, block, onChangeBlock, selected, pathname }) => { const intl = useIntl(); return ( @@ -24,6 +24,7 @@ const Edit = ({ data, block, onChangeBlock, selected, pathname }) => { )} {
{ +const Body = ({ data, id, inEditMode, path, onChangeBlock }) => { const intl = useIntl(); const b_size = 6; @@ -40,14 +41,19 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { const dispatch = useDispatch(); const querystringResults = useSelector((state) => { - return state.querystringsearch?.subrequests?.uo_search; + return state.querystringsearch?.subrequests?.[id + '_uo_search']; }); const items = useSelector((state) => { - return state.querystringsearch?.subrequests?.uo_search?.items ?? []; + return ( + state.querystringsearch?.subrequests?.[id + '_uo_search']?.items ?? [] + ); }); const loading = useSelector((state) => { - return state.querystringsearch?.subrequests?.uo_search?.loading || false; + return ( + state.querystringsearch?.subrequests?.[id + '_uo_search']?.loading || + false + ); }); const resultsRef = createRef(); @@ -86,7 +92,7 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { query: query, b_size: b_size, }, - 'uo_search', + id + '_uo_search', page, ), ); @@ -106,6 +112,7 @@ const Body = ({ data, inEditMode, path, onChangeBlock }) => { newState = { ...getInitialState(), }; + dispatch(resetQuerystringResults(id + '_uo_search')); } else { const f = newState[action.filter]; const defaultReducer = (value, state) => value; diff --git a/src/components/ItaliaTheme/Blocks/UOSearch/Edit.jsx b/src/components/ItaliaTheme/Blocks/UOSearch/Edit.jsx index 3b0480dae..96223efc5 100644 --- a/src/components/ItaliaTheme/Blocks/UOSearch/Edit.jsx +++ b/src/components/ItaliaTheme/Blocks/UOSearch/Edit.jsx @@ -14,7 +14,7 @@ const messages = defineMessages({ }, }); -const Edit = ({ data, block, onChangeBlock, selected, pathname }) => { +const Edit = ({ data, id, block, onChangeBlock, selected, pathname }) => { const intl = useIntl(); return ( @@ -24,6 +24,7 @@ const Edit = ({ data, block, onChangeBlock, selected, pathname }) => { )} {
{ return item.linkUrl?.length > 0 ? ( @@ -239,7 +240,12 @@ const MegaMenu = ({ item, pathname }) => { } return ( - + { {intl.formatMessage(messages.modified)}:{' '} - {viewDate(intl.locale, content.modified, 'DD-MM-Y, HH:MM')} + {viewDate(intl.locale, content.modified, 'DD-MM-Y, HH:mm')}

{content.rights && ( <> diff --git a/src/components/ItaliaTheme/View/DocumentoView/DocumentoDescrizione.jsx b/src/components/ItaliaTheme/View/DocumentoView/DocumentoDescrizione.jsx index 9e44d10c5..a5d5d17a0 100644 --- a/src/components/ItaliaTheme/View/DocumentoView/DocumentoDescrizione.jsx +++ b/src/components/ItaliaTheme/View/DocumentoView/DocumentoDescrizione.jsx @@ -42,11 +42,15 @@ const DocumentoDescrizione = ({ content }) => { return richTextHasContent(content.descrizione_estesa) || contentFolderHasItems(content, 'multimedia') || content.autori?.length > 0 || - content.licenza_distribuzione?.length > 0 ? ( + content.identificativo || + content.licenza_distribuzione?.length > 0 || + content.tipologia_licenze?.title || + content.tipologia_documento?.length > 0 || + content.tipologia_documenti_albopretorio?.title ? ( {contentFolderHasItems(content, 'multimedia') && ( @@ -61,7 +65,7 @@ const DocumentoDescrizione = ({ content }) => { )} {content.identificativo && (
-

{intl.formatMessage(messages.identificativo)}

+

{intl.formatMessage(messages.identificativo)}

{content.identificativo}

)} @@ -71,7 +75,9 @@ const DocumentoDescrizione = ({ content }) => { {(content.licenza_distribuzione?.length > 0 || content.tipologia_licenze?.title) && (
-

{intl.formatMessage(messages.licenza_distribuzione)}

+

+ {intl.formatMessage(messages.licenza_distribuzione)} +

{content.licenza_distribuzione?.length > 0 && (

{content.licenza_distribuzione}

)} @@ -82,7 +88,9 @@ const DocumentoDescrizione = ({ content }) => { )} {content.tipologia_documento?.length > 0 && (
-

{intl.formatMessage(messages.tipologia_documento)}

+

+ {intl.formatMessage(messages.tipologia_documento)} +

{content.tipologia_documento.map((tipo) => (

{tipo.title} @@ -92,9 +100,9 @@ const DocumentoDescrizione = ({ content }) => { )} {content.tipologia_documenti_albopretorio?.title && (

-

+

{intl.formatMessage(messages.tipologia_documenti_albopretorio)} -

+

{content.tipologia_documenti_albopretorio?.title}

diff --git a/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno.jsx b/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno.jsx index 85ff6ea56..2dab19114 100644 --- a/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno.jsx +++ b/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreEsterno.jsx @@ -1,30 +1,33 @@ -import { useIntl, defineMessages } from 'react-intl'; import PropTypes from 'prop-types'; +import { defineMessages, useIntl } from 'react-intl'; import { Card, CardBody } from 'design-react-kit'; -import { Icon } from 'design-comuni-plone-theme/components/ItaliaTheme'; import { RichText, richTextHasContent, ContactLink, } from 'design-comuni-plone-theme/components/ItaliaTheme/View'; +const messages = defineMessages({ + organizzatore: { + id: 'organizzatore', + defaultMessage: 'Organizzatore', + }, +}); + const EventoContattiOrganizzatoreEsterno = ({ content }) => { const intl = useIntl(); + return richTextHasContent(content?.organizzato_da_esterno) || content?.telefono || content?.email || content?.fax ? ( -
+
+

{intl.formatMessage(messages.organizzatore)}

- - {content?.telefono && ( @@ -57,11 +60,4 @@ EventoContattiOrganizzatoreEsterno.propTypes = { content: PropTypes.object.isRequired, }; -const messages = defineMessages({ - icona_telefono: { - id: 'icona_telefono', - defaultMessage: 'Icona telefono', - }, -}); - export default EventoContattiOrganizzatoreEsterno; diff --git a/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreInterno.jsx b/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreInterno.jsx index 22d9c4f4a..a0518130f 100644 --- a/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreInterno.jsx +++ b/src/components/ItaliaTheme/View/EventoView/EventoContattiOrganizzatoreInterno.jsx @@ -23,7 +23,6 @@ const EventoContattiOrganizzatoreInterno = ({ content }) => { margin_bottom={index < content?.organizzato_da_interno?.length - 1} key={item['@id']} office={item} - icon={'it-telephone'} > {richTextHasContent(content?.contatto_reperibilita) && (

diff --git a/src/components/ItaliaTheme/View/__tests__/ServizioMetadati.test.jsx b/src/components/ItaliaTheme/View/__tests__/ServizioMetadati.test.jsx index 41434ddcd..10748098f 100644 --- a/src/components/ItaliaTheme/View/__tests__/ServizioMetadati.test.jsx +++ b/src/components/ItaliaTheme/View/__tests__/ServizioMetadati.test.jsx @@ -2235,7 +2235,7 @@ test('expect to render fields in page', async () => { ); expect(screen.getByText(/Ultimo aggiornamento/i)).toBeInTheDocument(); - expect(screen.getByText(/15-03-2023, 15:03/i)).toBeInTheDocument(); + expect(screen.getByText(/15-03-2023, 15:56/i)).toBeInTheDocument(); }); test('todo', () => { diff --git a/src/config/italiaConfig.js b/src/config/italiaConfig.js index c423005fe..0888c4570 100644 --- a/src/config/italiaConfig.js +++ b/src/config/italiaConfig.js @@ -33,6 +33,7 @@ import LeftColumnFacets from '@plone/volto/components/manage/Blocks/Search/layou import HandleAnchor from 'design-comuni-plone-theme/components/ItaliaTheme/AppExtras/HandleAnchor'; import GenericAppExtras from 'design-comuni-plone-theme/components/ItaliaTheme/AppExtras/GenericAppExtras'; import PageLoader from 'design-comuni-plone-theme/components/ItaliaTheme/AppExtras/PageLoader'; +import TrackFocus from 'design-comuni-plone-theme/components/ItaliaTheme/AppExtras/TrackFocus'; import redraft from 'redraft'; import { loadables as ItaliaLoadables } from 'design-comuni-plone-theme/config/loadables'; @@ -65,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({ @@ -291,6 +292,10 @@ export default function applyConfig(voltoConfig) { match: '', component: PageLoader, }, + { + match: '', + component: TrackFocus, + }, ], maxFileUploadSize: null, 'volto-blocks-widget': { @@ -388,6 +393,7 @@ export default function applyConfig(voltoConfig) { const customBlocks = { ...getItaliaBlocks(config), + listing: { ...config.blocks.blocksConfig.listing, showLinkMore: true, @@ -457,6 +463,12 @@ export default function applyConfig(voltoConfig) { showEditBlocksInBabelView: true, }; + //per avere la conf dei blocchi anche nel blocco grid, altrimenti nel blocco grid prende la conf base di volto. + config.blocks.blocksConfig.gridBlock = { + ...config.blocks.blocksConfig.gridBlock, + blocksConfig: config.blocks.blocksConfig, + }; + removeListingVariation(config, 'default'); // removes default volto template, because it will be overrided removeListingVariation(config, 'summary'); // removes summary volto template, because is unused removeListingVariation(config, 'imageGallery'); // removes imageGallery volto template, because we have our photoGallery template diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index f710f8533..f69231d45 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -100,7 +100,11 @@ const Navigation = ({ pathname }) => { { setCollapseOpen(!collapseOpen); setFocusTrapActive(!focusTrapActive); @@ -108,7 +112,11 @@ const Navigation = ({ pathname }) => { > .card-teaser { + flex: 0 0 49%; //invece di 3 elementi per riga, ne mostro due perchè c'è poco spazio + } + } + } + + &.cardWithImageTemplate, + &.ribbonCardTemplate, + &.completeBlockLinksTemplate { + .col-lg-4, + .col-xl-4, + .col-lg-3 { + width: 50%; //invece di 3 elementi per riga, ne mostro due perchè c'è poco spazio + } + } + + &.cardSlideUpTextTemplate, + &.quaresImageTemplate { + .grid { + grid-template-columns: 1fr 1fr; + } + } + + &.bandiInEvidenceTemplate { + .bandi-in-evidence-cards-wrapper { + grid-template-columns: 1fr 1fr; + } + } + } + } + + //in edit (cms-ui) .gridBlock-container { position: relative; max-width: 1320px; @@ -15,6 +65,11 @@ left: 16px !important; } + .block-editor-listing { + padding-right: 0; + padding-left: 0; + } + .block { .image { .ui.message { @@ -30,3 +85,18 @@ } } } + +body.cms-ui.has-toolbar.has-sidebar { + .block.gridBlock { + .public-ui { + .container { + width: auto !important; + } + + .full-width > .px-4.container { + padding-right: 24px !important; + padding-left: 24px !important; + } + } + } +} diff --git a/src/theme/ItaliaTheme/Blocks/common/_searchBlockFilters.scss b/src/theme/ItaliaTheme/Blocks/common/_searchBlockFilters.scss index f25e64b45..1e544c53e 100644 --- a/src/theme/ItaliaTheme/Blocks/common/_searchBlockFilters.scss +++ b/src/theme/ItaliaTheme/Blocks/common/_searchBlockFilters.scss @@ -110,6 +110,18 @@ } } + .bg-primary { + .search-container { + .filter-wrapper { + &.select-filter { + .react-select__input { + color: color-contrast($primary); + } + } + } + } + } + .bg-secondary { .search-container { .filter-wrapper { @@ -140,6 +152,10 @@ .react-select__single-value { color: $secondary-text !important; } + + .react-select__input { + color: color-contrast($secondary); + } } &.date-filter .DateRangePickerInput { diff --git a/src/theme/ItaliaTheme/Components/_navigation.scss b/src/theme/ItaliaTheme/Components/_navigation.scss new file mode 100644 index 000000000..fe6451c66 --- /dev/null +++ b/src/theme/ItaliaTheme/Components/_navigation.scss @@ -0,0 +1,15 @@ +.public-ui { + .navbar { + .navbar-collapsable { + .navbar-nav { + li { + a.nav-link { + &.focus--mouse { + border-color: unset !important; + } + } + } + } + } + } +} diff --git a/src/theme/ItaliaTheme/Print/_all_pages.scss b/src/theme/ItaliaTheme/Print/_all_pages.scss index c2b5126bf..83d66ecc0 100644 --- a/src/theme/ItaliaTheme/Print/_all_pages.scss +++ b/src/theme/ItaliaTheme/Print/_all_pages.scss @@ -206,4 +206,36 @@ visibility: hidden; } } + + //subsite footer + .subsite-footer { + display: none; + } + + //text editor styles + .public-ui { + p.callout-bg, + p.callout { + margin: 0.5rem 0rem; + padding: 0rem 1.25rem; + font-size: 1rem; + border: none; + box-shadow: none; + } + } + + .draft-text-larger { + font-size: 1.2rem; + } + + .public-ui .draftjs-buttons a { + background-color: white; + color: $link-color; + padding: 0rem; + } + + //external link icon + svg.external-link { + display: none; + } } diff --git a/src/theme/ItaliaTheme/Print/_page.scss b/src/theme/ItaliaTheme/Print/_page.scss new file mode 100644 index 000000000..85eb00840 --- /dev/null +++ b/src/theme/ItaliaTheme/Print/_page.scss @@ -0,0 +1,20 @@ +.contenttype-document { + @media print { + .PageHeaderWrapper { + &.mb-4 { + margin-bottom: 0rem; + } + .title-description-wrapper { + h1 { + font-size: 1.5rem; + } + } + } + + p { + margin-bottom: 0rem; + margin-top: 1rem; + font-size: 1rem; + } + } +} diff --git a/src/theme/ItaliaTheme/_main.scss b/src/theme/ItaliaTheme/_main.scss index 0201a47d5..9cfc4eff1 100644 --- a/src/theme/ItaliaTheme/_main.scss +++ b/src/theme/ItaliaTheme/_main.scss @@ -345,7 +345,7 @@ iframe { .block.image img { width: auto; - height: 75px; + max-height: 75px; } .block.gridBlock { diff --git a/src/theme/site.scss b/src/theme/site.scss index eb25da48f..0334d6208 100644 --- a/src/theme/site.scss +++ b/src/theme/site.scss @@ -41,6 +41,7 @@ @import 'ItaliaTheme/Components/sideMenu'; @import 'ItaliaTheme/Components/loginAgid'; @import 'ItaliaTheme/Components/pager'; +@import 'ItaliaTheme/Components/navigation'; @import 'ItaliaTheme/Blocks/subblocks-edit'; @import 'ItaliaTheme/Blocks/listing'; @import 'ItaliaTheme/Blocks/tableOfContents'; @@ -134,6 +135,7 @@ @import 'ItaliaTheme/Components/navscroll'; @import 'ItaliaTheme/Components/customerSatisfaction'; @import 'ItaliaTheme/Print/all_pages'; +@import 'ItaliaTheme/Print/page'; @import 'ItaliaTheme/Print/news_items'; @import 'ItaliaTheme/Print/bandi'; @import 'ItaliaTheme/Print/persona'; diff --git a/yarn.lock b/yarn.lock index 59d137092..b0d1d8705 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6574,7 +6574,7 @@ __metadata: volto-blocks-widget: 3.4.0 volto-data-grid-widget: 2.3.1 volto-dropdownmenu: 4.1.1 - volto-editablefooter: 5.1.0 + volto-editablefooter: 5.1.1 volto-feedback: 0.3.0 volto-form-block: 3.7.2 volto-gdpr-privacy: 2.1.1 @@ -14332,15 +14332,15 @@ __metadata: languageName: node linkType: hard -"volto-editablefooter@npm:5.1.0": - version: 5.1.0 - resolution: "volto-editablefooter@npm:5.1.0" +"volto-editablefooter@npm:5.1.1": + version: 5.1.1 + resolution: "volto-editablefooter@npm:5.1.1" dependencies: react-outside-click-handler: 1.3.0 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" volto-blocks-widget: ">=3.4.0" - checksum: 2a1316344048e7447da39b513e067b9368f90057d1ef9bc6541ba0b9cd4a1c04b5246943677a5238d3391c30f3778320fe6e12f3f7c8f310adc61b1c6c8016ad + checksum: c9a2e1f96f1aacf10b30052eac5a4f069afc9e32773b0d2f7a35f9a7b5711c2dd4f9cc59acb6d6ada488071cee9cd8fcca732ad59d45acc866140f5ee1c6689e languageName: node linkType: hard