Skip to content

Commit

Permalink
Merge branch 'main' into new-folder-contents
Browse files Browse the repository at this point in the history
  • Loading branch information
pnicolli committed Jun 12, 2024
2 parents 1daf867 + 5d46f09 commit a6c93a5
Show file tree
Hide file tree
Showing 29 changed files with 409 additions and 164 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
21 changes: 21 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions locales/es/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions locales/fr/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions locales/it/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 11 additions & 1 deletion locales/volto.pot
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>\n"
"Language-Team: Plone i18n <[email protected]>\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ const AttachmentCardTemplate = ({
<div className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal card-teaser-block-3 mb-3">
{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 (
<Card
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
ListingImage,
ListingText,
CardPersona,
RassegnaInfo,
} from 'design-comuni-plone-theme/components/ItaliaTheme';

const CardWithImageDefault = (props) => {
Expand Down Expand Up @@ -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' ? (
Expand Down Expand Up @@ -119,7 +123,12 @@ const CardWithImageDefault = (props) => {
<ListingCategory category={category} item={item} />
</CardCategory>
)}
<CardTitle tag="h3">
<CardTitle
tag="h3"
className={`${
isEventAppointment ? 'rassegna-appointment-title' : ''
}`}
>
<UniversalLink
item={!isEditMode ? item : null}
href={isEditMode ? '#' : ''}
Expand All @@ -129,6 +138,7 @@ const CardWithImageDefault = (props) => {
{item.title || item.id}
</UniversalLink>
</CardTitle>
{isEventAppointment && <RassegnaInfo eventoPadre={item.parent} />}
{listingText && (
<CardText
className={cx('', {
Expand Down
28 changes: 28 additions & 0 deletions src/components/ItaliaTheme/Blocks/Listing/Commons/RassegnaInfo.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { UniversalLink } from '@plone/volto/components';

const RassegnaInfo = ({ eventoPadre }) => {
const intl = useIntl();
return (
<div className="rassegna-info mb-3 mt-1">
<span className="rassegna-label">
{intl.formatMessage(messages.rassegna_label)}
</span>
<span className="rassegna-name">
<UniversalLink href={eventoPadre['@id']}>
{eventoPadre.title}
</UniversalLink>
</span>
</div>
);
};

const messages = defineMessages({
rassegna_label: {
id: 'rassegna_label',
defaultMessage: 'Rassegna:',
},
});

export default RassegnaInfo;
Loading

0 comments on commit a6c93a5

Please sign in to comment.