diff --git a/CHANGELOG.md b/CHANGELOG.md index 88fec42a5..0b003ec81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ +## [11.12.9](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.12.8...v11.12.9) (2024-06-06) + + +### Bug Fixes + +* login and password reset page font ([666baf7](https://github.com/RedTurtle/design-comuni-plone-theme/commit/666baf7281f9fac6e8e7beec9f2442deb85ea166)) +* view link in attachment card template ([#690](https://github.com/RedTurtle/design-comuni-plone-theme/issues/690)) ([8e03a21](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8e03a21990cc2a8006ccd78b836fefdb80a69ede)) + + +### Documentation + +* updated publiccode and release log ([17bcbc7](https://github.com/RedTurtle/design-comuni-plone-theme/commit/17bcbc7f8106eef52d3d398fcec4b5f48b4501bb)) + ## [11.12.8](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.12.7...v11.12.8) (2024-06-04) diff --git a/RELEASE.md b/RELEASE.md index 4c400b415..9e6828e3d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -41,6 +41,27 @@ - ... --> +## Versione X.X.X (dd/mm/yyyy) + +### 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 + +- La pagina di login e di reset della password usano il font corretto. + ## Versione 11.12.6 (30/05/2024) ### Fix diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po index 81c75fa2b..534ed2d12 100644 --- a/locales/de/LC_MESSAGES/volto.po +++ b/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" diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po index f85ec46ed..0473bd259 100644 --- a/locales/en/LC_MESSAGES/volto.po +++ b/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" diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po index 27f65efa5..071c8a444 100644 --- a/locales/es/LC_MESSAGES/volto.po +++ b/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" diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po index 67389b02a..b1c156600 100644 --- a/locales/fr/LC_MESSAGES/volto.po +++ b/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" diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po index 28f863693..b58f51bfc 100644 --- a/locales/it/LC_MESSAGES/volto.po +++ b/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" diff --git a/locales/volto.pot b/locales/volto.pot index 5745efb5c..2ad00fb76 100644 --- a/locales/volto.pot +++ b/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 \n" "Language-Team: Plone i18n \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" diff --git a/package.json b/package.json index 593b3c67d..cbc4d3f3e 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.12.8", + "version": "11.12.9", "main": "src/index.js", "repository": { "type": "git", @@ -131,7 +131,7 @@ "@eeacms/volto-taxonomy": "^1.0.0", "@loadable/babel-plugin": "5.13.2", "@plone-collective/volto-contents-next": "0.4.4", - "@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", @@ -148,24 +148,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.5", + "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": { diff --git a/publiccode.yml b/publiccode.yml index a4652fb44..a4137240d 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-06-04' +releaseDate: '2024-06-06' softwareType: standalone/web -softwareVersion: 11.12.8 +softwareVersion: 11.12.9 url: 'https://github.com/italia/design-comuni-plone-theme' usedBy: - ASP Comuni Modenesi Area Nord diff --git a/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx b/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx index d1c4dcd23..0084b16da 100644 --- a/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx +++ b/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, diff --git a/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js b/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js index 6ecdf1179..2fcced8e4 100644 --- a/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js +++ b/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, }, }, diff --git a/src/components/ItaliaTheme/Blocks/Listing/AttachmentCardTemplate.jsx b/src/components/ItaliaTheme/Blocks/Listing/AttachmentCardTemplate.jsx index aee103190..7ffb797fe 100644 --- a/src/components/ItaliaTheme/Blocks/Listing/AttachmentCardTemplate.jsx +++ b/src/components/ItaliaTheme/Blocks/Listing/AttachmentCardTemplate.jsx @@ -51,16 +51,17 @@ const AttachmentCardTemplate = ({
{items.map((item, index) => { let itemUrl = { ...item }; - if (item['@type'] === 'File') { - itemUrl = { - ...item, - file: item, - '@id': - show_pdf_preview && item?.mime_type === 'application/pdf' - ? item?.['@id'] + '/@@display-file/file' - : item?.['@id'] + '/@@download/file', - }; - } + //la parte qui sotto commentata non serve perchè gestisce gia tutto UniversalLink e in view si vedrebbe /@@download/file duplicato nell url + // if (item['@type'] === 'File') { + // itemUrl = { + // ...item, + // file: item, + // '@id': + // show_pdf_preview && item?.mime_type === 'application/pdf' + // ? item?.['@id'] + '/@@display-file/file' + // : item?.['@id'] + '/@@download/file', + // }; + // } return ( { @@ -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) => { )} - + { {item.title || item.id} + {isEventAppointment && } {listingText && ( { + const intl = useIntl(); + return ( +
+ + {intl.formatMessage(messages.rassegna_label)} + + + + {eventoPadre.title} + + +
+ ); +}; + +const messages = defineMessages({ + rassegna_label: { + id: 'rassegna_label', + defaultMessage: 'Rassegna:', + }, +}); + +export default RassegnaInfo; diff --git a/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx b/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx index 63002c741..25b003800 100644 --- a/src/components/ItaliaTheme/Blocks/Listing/ContentInEvidenceTemplate.jsx +++ b/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 ( {image && ( @@ -93,11 +97,19 @@ const ContentInEvidenceTemplate = (props) => { item={item} /> - + {item.title} + {isEventAppointment && ( + + )} {listingText} {item.tassonomia_argomenti && diff --git a/src/components/ItaliaTheme/Blocks/Listing/InEvidenceTemplate.jsx b/src/components/ItaliaTheme/Blocks/Listing/InEvidenceTemplate.jsx index 835e60f0e..eb8ca7882 100644 --- a/src/components/ItaliaTheme/Blocks/Listing/InEvidenceTemplate.jsx +++ b/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' ? ( { )} )} - + { {item.title || item.id} + {isEventAppointment && ( + + )} {listingText && ( { name: 'BlockExtraTags', dependencies: ['RibbonCardTemplate', item['@type']], }).component; + + const isEventAppointment = + item.parent?.['@type'] === 'Event' && item?.['@type'] === 'Event'; + return ( { className={cx('', { 'mt-5': !showRibbon })} > {date &&
{date}
} - + { {itemTitle} + {isEventAppointment && ( + + )} + {listingText && {listingText}} {eventRecurrenceMore} diff --git a/src/components/ItaliaTheme/Blocks/Listing/SimpleCard/Card/SimpleCardDefault.jsx b/src/components/ItaliaTheme/Blocks/Listing/SimpleCard/Card/SimpleCardDefault.jsx index 0fd2abdc3..c645d669e 100644 --- a/src/components/ItaliaTheme/Blocks/Listing/SimpleCard/Card/SimpleCardDefault.jsx +++ b/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 ( { )} )} - + { {itemTitle} + {isEventAppointment && } {listingText && ( {listingText} diff --git a/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx b/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx index 89d92767b..3570afd8f 100644 --- a/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx +++ b/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx @@ -37,9 +37,11 @@ const FontAwesomeIcon = (props) => { ? 'brands' : prefixKey === 'far' ? 'regular' - : prefixKey != null - ? prefixKey - : 'solid', + : prefixKey === 'fas' + ? 'solid' + : prefixKey != null + ? prefixKey + : 'solid', iconName, ]; }; diff --git a/src/components/ItaliaTheme/SkipLinks/SkipLinks.jsx b/src/components/ItaliaTheme/SkipLinks/SkipLinks.jsx index eed6c8bd3..c2f247fa6 100644 --- a/src/components/ItaliaTheme/SkipLinks/SkipLinks.jsx +++ b/src/components/ItaliaTheme/SkipLinks/SkipLinks.jsx @@ -31,17 +31,19 @@ const SkipLinks = () => { }, []); return ( - - - {intl.formatMessage(messages.mainView)} - - - {intl.formatMessage(messages.navigation)} - - - {intl.formatMessage(messages.footer)} - - +
+ + + {intl.formatMessage(messages.mainView)} + + + {intl.formatMessage(messages.navigation)} + + + {intl.formatMessage(messages.footer)} + + +
); }; diff --git a/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx b/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx index 186f649a0..ee63a92a7 100644 --- a/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx +++ b/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) => ( -
-

{incarico.title}

- {incarico.atto_di_nomina && ( - - {intl.formatMessage(messages.atto_nomina)} - - )} -
- ))} +
+

{content?.incarichi_persona[0]?.title}

+ {content?.incarichi_persona[0]?.atto_di_nomina && ( + + {intl.formatMessage(messages.atto_nomina)} + + )} +
{content.incarichi_persona[0]?.tipologia_incarico?.title && ( { 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 && ( + +
    + {content.incarichi_persona.map((incarico, index) => + index > 0 ? ( +
  • + + {incarico.title} + +
    • + ) : null, + )} +
+ + )} + {content.assessore_di?.length > 0 && ( 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'); /****************************************************************************** diff --git a/src/helpers/ListingHelper.js b/src/helpers/ListingHelper.js index 3d63e1fc1..3fd3199e1 100644 --- a/src/helpers/ListingHelper.js +++ b/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 = ( { @@ -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; diff --git a/src/theme/ItaliaTheme/Components/_card.scss b/src/theme/ItaliaTheme/Components/_card.scss index 49e855da6..661a28a04 100644 --- a/src/theme/ItaliaTheme/Components/_card.scss +++ b/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 { + display: inline-flex; + column-gap: 0.3rem; + font-size: 0.9rem; + + a { + text-decoration: none; + } } } } diff --git a/src/theme/_cms-ui.scss b/src/theme/_cms-ui.scss index 142ec9b3a..0983c767a 100644 --- a/src/theme/_cms-ui.scss +++ b/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; @@ -646,6 +620,12 @@ body.cms-ui { } #page-login { + .ui.text.container, + .ui.form input[type='text'], + .ui.form input[type='password'] { + font-family: $font-family-sans-serif; + } + .help { a { color: $link-color; @@ -703,6 +683,14 @@ body.cms-ui { } } + #page-password-reset { + &, + h1, + .ui.message .header { + font-family: $font-family-sans-serif; + } + } + .objectbrowser-field { .selected-values { .ui.label { diff --git a/yarn.lock b/yarn.lock index ab114dd2f..9efa47971 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3966,15 +3966,15 @@ __metadata: languageName: node linkType: hard -"@plone-collective/volto-sentry@npm:0.3.0": - version: 0.3.0 - resolution: "@plone-collective/volto-sentry@npm:0.3.0" +"@plone-collective/volto-sentry@npm:0.3.1": + version: 0.3.1 + resolution: "@plone-collective/volto-sentry@npm:0.3.1" dependencies: "@sentry/browser": 7.15.0 "@sentry/integrations": 7.15.0 "@sentry/node": 7.15.0 "@sentry/webpack-plugin": 1.19.1 - checksum: 99e5493e46fdc93d69dcdacfdbd7a4ca746952edca805ff095a5fd6789a41820510e4e73d0a4d218f9fbb9b65f80641ac4f2a0c65753a20f193f88e92a04ee1d + checksum: cf3a1928608a8444cf09203037063d098da329e62bd2550ca36787f27a96ae8b03b1357943767f4e566f9e51d232ef59a533d8dc438bb6ffa7ce0bcb13b19aa1 languageName: node linkType: hard @@ -8184,7 +8184,7 @@ __metadata: "@eeacms/volto-taxonomy": ^1.0.0 "@loadable/babel-plugin": 5.13.2 "@plone-collective/volto-contents-next": 0.4.4 - "@plone-collective/volto-sentry": 0.3.0 + "@plone-collective/volto-sentry": 0.3.1 "@plone/scripts": "*" "@release-it/conventional-changelog": 5.1.1 bootstrap-italia: 2.6.1 @@ -8226,24 +8226,24 @@ __metadata: 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.5 + 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 peerDependencies: "@plone/volto": 17.7.0 @@ -16101,12 +16101,12 @@ __metadata: languageName: node linkType: hard -"volto-blocks-widget@npm:3.4.0": - version: 3.4.0 - resolution: "volto-blocks-widget@npm:3.4.0" +"volto-blocks-widget@npm:3.4.1": + version: 3.4.1 + resolution: "volto-blocks-widget@npm:3.4.1" peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 355675359cc64b23c0357de8b952195a9693543a7e95c2c1f463b65fc7bd081d64aca8f2086e95775d5771f7071d681276f18a968e666dbead40e2c48ee9843a + checksum: 4f5c183698e38edd40f24d7f35d3d59745c67b77ffaf0b2e448d8c7696453e9c83bbcd1b3c91599e6ccb77d64177fd7923d9ad36607dc1a41cba7fa9b20029b2 languageName: node linkType: hard @@ -16119,65 +16119,65 @@ __metadata: languageName: node linkType: hard -"volto-dropdownmenu@npm:4.1.1": - version: 4.1.1 - resolution: "volto-dropdownmenu@npm:4.1.1" +"volto-dropdownmenu@npm:4.1.3": + version: 4.1.3 + resolution: "volto-dropdownmenu@npm:4.1.3" dependencies: react-outside-click-handler: 1.3.0 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 81edb600753e8fbe3ec7a1fe2bac342925f5b3b6dbdec2377972fa6f06e3cf46396eb5857e7da99d8372d1c73c2c25d619f6ae092baf631501101208239e2913 + checksum: 5dc76c2ee7f71b0946dfa9add41549cce4fbd1fd2a3fcf3e6f6395880dbea029c9012202cdc8bf3009de090aee75188f761b55ebdbcefd9de117ad87e5b64dfd languageName: node linkType: hard -"volto-editablefooter@npm:5.1.1": - version: 5.1.1 - resolution: "volto-editablefooter@npm:5.1.1" +"volto-editablefooter@npm:5.1.6": + version: 5.1.6 + resolution: "volto-editablefooter@npm:5.1.6" dependencies: react-outside-click-handler: 1.3.0 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" volto-blocks-widget: ">=3.4.0" - checksum: c9a2e1f96f1aacf10b30052eac5a4f069afc9e32773b0d2f7a35f9a7b5711c2dd4f9cc59acb6d6ada488071cee9cd8fcca732ad59d45acc866140f5ee1c6689e + checksum: 0e479d49c417e4eac3d15d49752bab794647b24b7eb800dbfd841d351a681d34b1353a03a2c681c53c8be4cc4336b14b07a1320d4bae29ee2112402ce90edac4 languageName: node linkType: hard -"volto-feedback@npm:0.3.0": - version: 0.3.0 - resolution: "volto-feedback@npm:0.3.0" +"volto-feedback@npm:0.3.2": + version: 0.3.2 + resolution: "volto-feedback@npm:0.3.2" dependencies: react-google-recaptcha-v3: 1.9.5 semantic-ui-css: 2.5.0 peerDependencies: "@plone/volto": ">=16.0.0" - checksum: 5d4fe0327995d0e6dfaaed5594938b463212856d80b66619f19815fcd1c65b71ed422f47b012082900dfff176d18806f6e568091ae1239288e870b5996a370b7 + checksum: bfc7951ca5761640896e54fbe84c612176f95bad06682b198596425905b592bf1a287664cc1a8ebade814325c4514313043e62568ae3ac2325a18a43d2c43722 languageName: node linkType: hard -"volto-form-block@npm:3.8.3": - version: 3.8.3 - resolution: "volto-form-block@npm:3.8.3" +"volto-form-block@npm:3.8.5": + version: 3.8.5 + resolution: "volto-form-block@npm:3.8.5" dependencies: "@hcaptcha/react-hcaptcha": ^0.3.6 file-saver: ^2.0.5 react-google-recaptcha-v3: ^1.8.0 - volto-subblocks: ^2.0.0 + volto-subblocks: ^2.1.0 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - volto-subblocks: ^2.0.0 - checksum: 44b043f3eab2ef11c328b1b185ea9711a6e67344745708f5b9f293fcde75f6037e5cd5e9baee2ee0ce4a661a1ef752564d73da12e4b792a475bce6b4bc0a47b8 + volto-subblocks: ^2.1.0 + checksum: db8d56e91b3c109803bf7006d96a0b8635f9fa96ec6faaae72bec7b3747f7980e2357d7c7f8c424a6b52d0ff6049da60030de8ea597697dd861c7eb1fd088611 languageName: node linkType: hard -"volto-gdpr-privacy@npm:2.2.5": - version: 2.2.5 - resolution: "volto-gdpr-privacy@npm:2.2.5" +"volto-gdpr-privacy@npm:2.2.6": + version: 2.2.6 + resolution: "volto-gdpr-privacy@npm:2.2.6" dependencies: react-focus-lock: 2.9.4 volto-multilingual-widget: 3.2.1 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 0cfc4e9ba7a7f19d9f71e2f8932a94f3a68a1cda6156b490e84b3e7855a5675b146029f261e65485150b0ff5697fa08c378a7c19c4a67542f644718fe5838962 + checksum: 604badfe7225ccc6783c05bada9fb03c07a66e673de6ca8bb681b9aedb48c2dd25213001f60a31e288811686dd41e28c0d38d95c8793df0b56ce5abe3b022087 languageName: node linkType: hard @@ -16224,21 +16224,21 @@ __metadata: languageName: node linkType: hard -"volto-secondarymenu@npm:4.0.0": - version: 4.0.0 - resolution: "volto-secondarymenu@npm:4.0.0" +"volto-secondarymenu@npm:4.1.1": + version: 4.1.1 + resolution: "volto-secondarymenu@npm:4.1.1" peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: cec270574025c0fdf66f050261d018738fb3784ff6d90524d6e034722aaa5e62216f286b720c45829e2de7fdc20cf694c49f5aeae37f6cad65dce88da1a03ade + checksum: 94eeac0bc4143825494448ecf80c135126d74f9901b63de148e266b0b3e2e98b24081fa7409074455b11505d8adbb9bab9673d6cc3b634ef847b2ad80b84f622 languageName: node linkType: hard -"volto-slimheader@npm:0.1.1": - version: 0.1.1 - resolution: "volto-slimheader@npm:0.1.1" +"volto-slimheader@npm:0.1.2": + version: 0.1.2 + resolution: "volto-slimheader@npm:0.1.2" peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 94bafa197c4ef2c8cbb15333df102fa189220cac5e24a95d330ebf1544a0203d4ec33fdbd7aafcc006d0bdbd529c87aa88f827ea7a8d9ef7ecb361291cab90af + checksum: fb657c3274785f3201d7720e8fde999e1be6cec18bda98634d6ed68192a524cbbb4298b48b9758d3600549b37db1bcc69b6a2f3264193f0956bb57dcc0db0e9b languageName: node linkType: hard @@ -16251,46 +16251,46 @@ __metadata: languageName: node linkType: hard -"volto-subblocks@npm:2.0.0, volto-subblocks@npm:^2.0.0": - version: 2.0.0 - resolution: "volto-subblocks@npm:2.0.0" +"volto-subblocks@npm:2.1.0, volto-subblocks@npm:^2.1.0": + version: 2.1.0 + resolution: "volto-subblocks@npm:2.1.0" dependencies: react-dnd: ^5.0.0 react-dnd-html5-backend: ^5.0.1 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 7e4774cd63aad14d46f8371d725d800cc978dafb3672cb9ddb16e032b8fc849948d7e39301c3d55864a40d5143e101fd819165ba5254a016be31812f826c4f76 + checksum: a1cc02ca26176b44398445084c9b90330e898ccb725247f131e71dcc8b1c9e70b3352b8dd4fcf322ea60df7970c02f001454151ab7a82b7a6f6ab96ed4ffc8d5 languageName: node linkType: hard -"volto-subfooter@npm:3.0.0": - version: 3.0.0 - resolution: "volto-subfooter@npm:3.0.0" +"volto-subfooter@npm:3.1.1": + version: 3.1.1 + resolution: "volto-subfooter@npm:3.1.1" peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: c7619ac55e4e8d148c080e3333f612afb2b38a42b2f754f984cf0725972684625e84f5bab4c03f4480ce7911c8833cdfdf66765ed47496022cb983cdbd178a8e + checksum: d03848013d08790d5a736c9e788ed101cbe0d7d89eb6c73eef45e330cc3082edf1f3ccbb787a98ed25a1b90719b7caf9f7c96d7b013cf3ae9c6682a12169bd3a languageName: node linkType: hard -"volto-subsites@npm:4.0.0": - version: 4.0.0 - resolution: "volto-subsites@npm:4.0.0" +"volto-subsites@npm:4.0.1": + version: 4.0.1 + resolution: "volto-subsites@npm:4.0.1" peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: 9f943abc00fb1d25d1bf2b487b9f545663ad85b216c751a2fd37739cea7cfd62de958edc8bdfbb51b3e795007199706b272f344e9e08179874a02f903b3e2071 + checksum: 0796a9f77c2a4666898ecc6d23af3d7c15afe9053a6ea2f690db0cb93082327143225f02620591033b335b94f0fa7f78fed458157cdb1142cf47739e5678b8ae languageName: node linkType: hard -"volto-venue@npm:4.0.2": - version: 4.0.2 - resolution: "volto-venue@npm:4.0.2" +"volto-venue@npm:4.1.0": + version: 4.1.0 + resolution: "volto-venue@npm:4.1.0" dependencies: leaflet: 1.6.0 leaflet.markercluster: 1.5.0 react-leaflet: 2.7.0 peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" - checksum: d6ebdb2e3da5de55a565939c814218a331b6611ce6211758d32d6c908882f30a16f885c9d316a40f2b00521d252f224f45aba7759f6f128a40e51df4f0e773a9 + checksum: 64ca36bc93a08e503fdc372476020a0643b109819b101a604c24221655a8c43d6a8b20ed61b759d1ad0a8d6a82b5c1b6c687438a7847ff40770e0d15dd1c0292 languageName: node linkType: hard