design-comuni-plone-theme 11.15.0 → 11.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/.github/workflows/main.yml +1 -1
  2. package/.github/workflows/performance.yml +1 -1
  3. package/.github/workflows/prs.yml +1 -1
  4. package/.github/workflows/release.yml +1 -1
  5. package/.yarn/cache/{volto-form-block-npm-3.8.7-d78dca483b-8c014bdf2d.zip → volto-form-block-npm-3.9.2-cb78fb6cd0-a47c5241be.zip} +0 -0
  6. package/.yarn/cache/volto-site-settings-npm-0.4.3-7926886a97-690d1c03a0.zip +0 -0
  7. package/.yarn/cache/{volto-subsites-npm-4.0.1-97a0109675-0796a9f77c.zip → volto-subsites-npm-4.0.2-715672140c-77408b4ea1.zip} +0 -0
  8. package/.yarn/install-state.gz +0 -0
  9. package/CHANGELOG.md +44 -0
  10. package/Makefile +1 -1
  11. package/RELEASE.md +20 -0
  12. package/locales/de/LC_MESSAGES/volto.po +3 -1
  13. package/locales/en/LC_MESSAGES/volto.po +3 -1
  14. package/locales/es/LC_MESSAGES/volto.po +3 -1
  15. package/locales/fr/LC_MESSAGES/volto.po +3 -1
  16. package/locales/it/LC_MESSAGES/volto.po +3 -1
  17. package/locales/volto.pot +4 -2
  18. package/package.json +7 -5
  19. package/publiccode.yml +2 -2
  20. package/src/components/ItaliaTheme/AppExtras/GenericAppExtras.jsx +1 -6
  21. package/src/components/ItaliaTheme/AppExtras/SiteSettingsExtras.jsx +35 -0
  22. package/src/components/ItaliaTheme/Blocks/EventSearch/DefaultFilters.js +3 -1
  23. package/src/components/ItaliaTheme/Blocks/Listing/SliderTemplate.jsx +3 -2
  24. package/src/components/ItaliaTheme/BrandText/BrandText.jsx +39 -7
  25. package/src/components/ItaliaTheme/BrandTextFooter/BrandTextFooter.jsx +1 -1
  26. package/src/components/ItaliaTheme/Breadcrumbs/Breadcrumbs.jsx +3 -1
  27. package/src/components/ItaliaTheme/Footer/FooterInfos.jsx +4 -2
  28. package/src/components/ItaliaTheme/Footer/FooterMain.jsx +4 -4
  29. package/src/components/ItaliaTheme/Footer/FooterSmall.jsx +10 -5
  30. package/src/components/ItaliaTheme/Header/HeaderCenter.jsx +5 -6
  31. package/src/components/ItaliaTheme/Header/HeaderSlim/HeaderSlim.jsx +25 -7
  32. package/src/components/ItaliaTheme/Header/ParentSiteMenu.jsx +3 -1
  33. package/src/components/ItaliaTheme/Logo/Logo.jsx +15 -7
  34. package/src/components/ItaliaTheme/LogoFooter/LogoFooter.jsx +11 -3
  35. package/src/components/ItaliaTheme/Slider/NextArrow.jsx +1 -1
  36. package/src/components/ItaliaTheme/Slider/PrevArrow.jsx +1 -1
  37. package/src/components/ItaliaTheme/View/Commons/Actions.jsx +2 -2
  38. package/src/components/ItaliaTheme/View/Commons/Argument/ArgumentIcon.jsx +1 -1
  39. package/src/components/ItaliaTheme/View/Commons/Attachment.jsx +1 -1
  40. package/src/components/ItaliaTheme/View/Commons/HelpBox.jsx +1 -1
  41. package/src/components/ItaliaTheme/View/Commons/RenderBlocks.jsx +5 -2
  42. package/src/components/ItaliaTheme/View/Commons/Sharing.jsx +1 -1
  43. package/src/components/ItaliaTheme/View/Commons/__tests__/Dates.test.jsx +1 -1
  44. package/src/components/ItaliaTheme/View/IncaricoView/IncaricoView.jsx +50 -8
  45. package/src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx +4 -6
  46. package/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx +13 -1
  47. package/src/components/ItaliaTheme/View/__tests__/ServizioTempiScadenze.test.jsx +0 -1
  48. package/src/config/italiaConfig.js +10 -0
  49. package/src/customizations/volto/components/theme/Navigation/Navigation.jsx +6 -5
  50. package/src/customizations/volto/helpers/Html/Html.jsx +2 -2
  51. package/src/helpers/index.js +1 -0
  52. package/src/helpers/url.js +15 -0
  53. package/src/theme/_cms-ui.scss +6 -0
  54. /package/src/components/ItaliaTheme/View/{__tests__/IncaricoView.test.jsx → __disabled_tests__/IncaricoView.test__disabled.jsx} +0 -0
@@ -31,7 +31,7 @@ jobs:
31
31
  build-args: |
32
32
  ADDON_NAME=design-comuni-plone-theme
33
33
  ADDON_PATH=design-comuni-plone-theme
34
- VOLTO_VERSION=17.18.1
34
+ VOLTO_VERSION=17.18.2
35
35
 
36
36
  - name: Deploy to rancher
37
37
  uses: redturtle/rancher-deploy-action@v0.2.0
@@ -31,7 +31,7 @@ jobs:
31
31
  build-args: |
32
32
  ADDON_NAME=design-comuni-plone-theme
33
33
  ADDON_PATH=design-comuni-plone-theme
34
- VOLTO_VERSION=17.18.1
34
+ VOLTO_VERSION=17.18.2
35
35
 
36
36
  - name: Deploy to rancher
37
37
  uses: redturtle/rancher-deploy-action@v0.2.0
@@ -34,4 +34,4 @@ jobs:
34
34
  build-args: |
35
35
  ADDON_NAME=design-comuni-plone-theme
36
36
  ADDON_PATH=design-comuni-plone-theme
37
- VOLTO_VERSION=17.18.1
37
+ VOLTO_VERSION=17.18.2
@@ -35,4 +35,4 @@ jobs:
35
35
  build-args: |
36
36
  ADDON_NAME=design-comuni-plone-theme
37
37
  ADDON_PATH=design-comuni-plone-theme
38
- VOLTO_VERSION=17.18.1
38
+ VOLTO_VERSION=17.18.2
Binary file
package/CHANGELOG.md CHANGED
@@ -1,5 +1,49 @@
1
1
 
2
2
 
3
+ ## [11.17.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.16.0...v11.17.0) (2024-07-16)
4
+
5
+
6
+ ### Features
7
+
8
+ * Site settings to manage title, logo, favicon ([#666](https://github.com/RedTurtle/design-comuni-plone-theme/issues/666)) ([fecf6c2](https://github.com/RedTurtle/design-comuni-plone-theme/commit/fecf6c25281016e6e893c85bfcdce28e5d5967c7))
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * added check for subsite to path in venue query for events search filter ([#718](https://github.com/RedTurtle/design-comuni-plone-theme/issues/718)) ([cd96ee0](https://github.com/RedTurtle/design-comuni-plone-theme/commit/cd96ee0c77e2bb91225528db7c85ffdf824f66d5))
14
+ * backward compatibility for new site settings panel ([f186923](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f1869233022ba4372b78c8b404034b1e97b708e2))
15
+ * better variables naming and resolved minor warnings ([4eb0c8d](https://github.com/RedTurtle/design-comuni-plone-theme/commit/4eb0c8d630bec8cb830a1903d4f3d6643a1dd2a4))
16
+ * blocks widget table block toolbar position ([#716](https://github.com/RedTurtle/design-comuni-plone-theme/issues/716)) ([a116542](https://github.com/RedTurtle/design-comuni-plone-theme/commit/a116542fa741193fe754417e3cd777a2b7c375eb))
17
+ * home link per languageRootFoolder ([#724](https://github.com/RedTurtle/design-comuni-plone-theme/issues/724)) ([5b0f809](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5b0f8099ec411a86d63c0a755451615f28238f3c))
18
+
19
+
20
+ ### Maintenance
21
+
22
+ * resolve linting issue ([c67a574](https://github.com/RedTurtle/design-comuni-plone-theme/commit/c67a574480053edd493d54729489b2e58e301323))
23
+
24
+
25
+ ### Documentation
26
+
27
+ * updated publiccode and release log ([f7becf8](https://github.com/RedTurtle/design-comuni-plone-theme/commit/f7becf81ef119ce1dc9c5b1138dd77e71a5c1754))
28
+
29
+ ## [11.16.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.15.0...v11.16.0) (2024-07-10)
30
+
31
+
32
+ ### Features
33
+
34
+ * added date fields to incarico view ([#711](https://github.com/RedTurtle/design-comuni-plone-theme/issues/711)) ([038ef58](https://github.com/RedTurtle/design-comuni-plone-theme/commit/038ef5803af9bcb417fc757bb8ee6a57e065bad7))
35
+ * updated volto-form-block v3.9.2 ([#709](https://github.com/RedTurtle/design-comuni-plone-theme/issues/709)) ([1b9fde0](https://github.com/RedTurtle/design-comuni-plone-theme/commit/1b9fde00f01f646eb27f088e09e662c9c1c8d9d6))
36
+
37
+
38
+ ### Bug Fixes
39
+
40
+ * update to volto 17.18.2 ([c1ce5ac](https://github.com/RedTurtle/design-comuni-plone-theme/commit/c1ce5ac3239b77b819909e224cbb07f0097230ea))
41
+
42
+
43
+ ### Documentation
44
+
45
+ * updated publiccode and release log ([5ea19f6](https://github.com/RedTurtle/design-comuni-plone-theme/commit/5ea19f65ffeac054e318c77014d4a0bab478415f))
46
+
3
47
  ## [11.15.0](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.14.0...v11.15.0) (2024-07-05)
4
48
 
5
49
 
package/Makefile CHANGED
@@ -27,7 +27,7 @@ CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
27
27
  # ADDON ?= "design-comuni-plone-theme"
28
28
 
29
29
  PLONE_VERSION=6
30
- VOLTO_VERSION=17.18.1
30
+ VOLTO_VERSION=17.18.2
31
31
 
32
32
  ADDON_NAME='design-comuni-plone-theme'
33
33
  ADDON_PATH='design-comuni-plone-theme'
package/RELEASE.md CHANGED
@@ -41,6 +41,26 @@
41
41
  - ...
42
42
  -->
43
43
 
44
+ ## Versione 11.17.0 (16/07/2024)
45
+
46
+ ### Novità
47
+
48
+ - Ora il titolo, sottotitolo, favicon, logo e logo del footer sono editabili dal pannello di controllo del Sito. Se non impostati, verranno usati quelli definiti dagli sviluppatori.
49
+
50
+ ### Fix
51
+
52
+ - Ripristinato il funzionamento del filtro luogo nella ricerca eventi.
53
+
54
+ ## Versione 11.16.0 (10/07/2024)
55
+
56
+ ### Migliorie
57
+
58
+ - Tutti i campi compilabili nel CT Incarico vengono ora visualizzati nella vista corrispondente.
59
+
60
+ ### Novità
61
+
62
+ - Aggiunti due campi nel blocco Form che permettono di configurare un testo per l'intestazione e uno a piè di pagina nella mail inviata.
63
+
44
64
  ## Versione 11.15.0 (05/07/2024)
45
65
 
46
66
  ### Novità
@@ -1468,6 +1468,7 @@ msgstr ""
1468
1468
  msgid "data_conclusione"
1469
1469
  msgstr ""
1470
1470
 
1471
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1471
1472
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1472
1473
  # defaultMessage: Ha fatto parte dell'organizzazione comunale come {incarico} fino al
1473
1474
  msgid "data_conclusione_incarico"
@@ -1478,6 +1479,7 @@ msgstr ""
1478
1479
  msgid "data_inizio"
1479
1480
  msgstr ""
1480
1481
 
1482
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1481
1483
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1482
1484
  # defaultMessage: Data di inizio dell'incarico
1483
1485
  msgid "data_inizio_incarico"
@@ -1485,7 +1487,7 @@ msgstr ""
1485
1487
 
1486
1488
  #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1487
1489
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1488
- # defaultMessage: Data insediamento
1490
+ # defaultMessage: Data di insediamento
1489
1491
  msgid "data_insediamento"
1490
1492
  msgstr ""
1491
1493
 
@@ -1453,6 +1453,7 @@ msgstr ""
1453
1453
  msgid "data_conclusione"
1454
1454
  msgstr ""
1455
1455
 
1456
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1456
1457
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1457
1458
  # defaultMessage: Ha fatto parte dell'organizzazione comunale come {incarico} fino al
1458
1459
  msgid "data_conclusione_incarico"
@@ -1463,6 +1464,7 @@ msgstr "He was part of the municipal organization until"
1463
1464
  msgid "data_inizio"
1464
1465
  msgstr ""
1465
1466
 
1467
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1466
1468
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1467
1469
  # defaultMessage: Data di inizio dell'incarico
1468
1470
  msgid "data_inizio_incarico"
@@ -1470,7 +1472,7 @@ msgstr ""
1470
1472
 
1471
1473
  #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1472
1474
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1473
- # defaultMessage: Data insediamento
1475
+ # defaultMessage: Data di insediamento
1474
1476
  msgid "data_insediamento"
1475
1477
  msgstr "Settlement date"
1476
1478
 
@@ -1462,6 +1462,7 @@ msgstr ""
1462
1462
  msgid "data_conclusione"
1463
1463
  msgstr ""
1464
1464
 
1465
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1465
1466
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1466
1467
  # defaultMessage: Ha fatto parte dell'organizzazione comunale come {incarico} fino al
1467
1468
  msgid "data_conclusione_incarico"
@@ -1472,6 +1473,7 @@ msgstr "Formó parte de la organización municipal hasta"
1472
1473
  msgid "data_inizio"
1473
1474
  msgstr ""
1474
1475
 
1476
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1475
1477
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1476
1478
  # defaultMessage: Data di inizio dell'incarico
1477
1479
  msgid "data_inizio_incarico"
@@ -1479,7 +1481,7 @@ msgstr ""
1479
1481
 
1480
1482
  #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1481
1483
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1482
- # defaultMessage: Data insediamento
1484
+ # defaultMessage: Data di insediamento
1483
1485
  msgid "data_insediamento"
1484
1486
  msgstr "Fecha de liquidación"
1485
1487
 
@@ -1470,6 +1470,7 @@ msgstr ""
1470
1470
  msgid "data_conclusione"
1471
1471
  msgstr ""
1472
1472
 
1473
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1473
1474
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1474
1475
  # defaultMessage: Ha fatto parte dell'organizzazione comunale come {incarico} fino al
1475
1476
  msgid "data_conclusione_incarico"
@@ -1480,6 +1481,7 @@ msgstr "Date de conclusion de la mission"
1480
1481
  msgid "data_inizio"
1481
1482
  msgstr ""
1482
1483
 
1484
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1483
1485
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1484
1486
  # defaultMessage: Data di inizio dell'incarico
1485
1487
  msgid "data_inizio_incarico"
@@ -1487,7 +1489,7 @@ msgstr ""
1487
1489
 
1488
1490
  #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1489
1491
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1490
- # defaultMessage: Data insediamento
1492
+ # defaultMessage: Data di insediamento
1491
1493
  msgid "data_insediamento"
1492
1494
  msgstr "Date de règlement"
1493
1495
 
@@ -1453,6 +1453,7 @@ msgstr "dal {dateStart} fino a conclusione"
1453
1453
  msgid "data_conclusione"
1454
1454
  msgstr "Data conclusione incarico"
1455
1455
 
1456
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1456
1457
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1457
1458
  # defaultMessage: Ha fatto parte dell'organizzazione comunale come {incarico} fino al
1458
1459
  msgid "data_conclusione_incarico"
@@ -1463,6 +1464,7 @@ msgstr "Ha fatto parte dell'organizzazione comunale come {incarico} fino al"
1463
1464
  msgid "data_inizio"
1464
1465
  msgstr "Data inizio incarico"
1465
1466
 
1467
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1466
1468
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1467
1469
  # defaultMessage: Data di inizio dell'incarico
1468
1470
  msgid "data_inizio_incarico"
@@ -1470,7 +1472,7 @@ msgstr "Data di inizio dell'incarico"
1470
1472
 
1471
1473
  #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1472
1474
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1473
- # defaultMessage: Data insediamento
1475
+ # defaultMessage: Data di insediamento
1474
1476
  msgid "data_insediamento"
1475
1477
  msgstr "Data di insediamento"
1476
1478
 
package/locales/volto.pot CHANGED
@@ -1,7 +1,7 @@
1
1
  msgid ""
2
2
  msgstr ""
3
3
  "Project-Id-Version: Plone\n"
4
- "POT-Creation-Date: 2024-06-11T14:57:29.832Z\n"
4
+ "POT-Creation-Date: 2024-07-15T11:07:19.251Z\n"
5
5
  "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
6
6
  "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
7
7
  "MIME-Version: 1.0\n"
@@ -1455,6 +1455,7 @@ msgstr ""
1455
1455
  msgid "data_conclusione"
1456
1456
  msgstr ""
1457
1457
 
1458
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1458
1459
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1459
1460
  # defaultMessage: Ha fatto parte dell'organizzazione comunale come {incarico} fino al
1460
1461
  msgid "data_conclusione_incarico"
@@ -1465,6 +1466,7 @@ msgstr ""
1465
1466
  msgid "data_inizio"
1466
1467
  msgstr ""
1467
1468
 
1469
+ #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1468
1470
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1469
1471
  # defaultMessage: Data di inizio dell'incarico
1470
1472
  msgid "data_inizio_incarico"
@@ -1472,7 +1474,7 @@ msgstr ""
1472
1474
 
1473
1475
  #: components/ItaliaTheme/View/IncaricoView/IncaricoView
1474
1476
  #: components/ItaliaTheme/View/PersonaView/PersonaRuolo
1475
- # defaultMessage: Data insediamento
1477
+ # defaultMessage: Data di insediamento
1476
1478
  msgid "data_insediamento"
1477
1479
  msgstr ""
1478
1480
 
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "design-comuni-plone-theme",
3
3
  "description": "Volto Theme for Italia design guidelines",
4
4
  "license": "GPL-v3",
5
- "version": "11.15.0",
5
+ "version": "11.17.0",
6
6
  "main": "src/index.js",
7
7
  "repository": {
8
8
  "type": "git",
@@ -36,7 +36,8 @@
36
36
  "volto-querywidget-with-browser",
37
37
  "@eeacms/volto-taxonomy",
38
38
  "volto-feedback",
39
- "volto-slimheader"
39
+ "volto-slimheader",
40
+ "volto-site-settings"
40
41
  ],
41
42
  "scripts": {
42
43
  "prepare": "husky install",
@@ -151,18 +152,19 @@
151
152
  "volto-dropdownmenu": "4.1.3",
152
153
  "volto-editablefooter": "5.1.7",
153
154
  "volto-feedback": "0.3.2",
154
- "volto-form-block": "3.8.7",
155
+ "volto-form-block": "3.9.2",
155
156
  "volto-gdpr-privacy": "2.2.7",
156
157
  "volto-google-analytics": "2.0.0",
157
158
  "volto-multilingual-widget": "3.2.1",
158
159
  "volto-querywidget-with-browser": "0.4.2",
159
160
  "volto-rss-block": "3.0.0",
160
161
  "volto-secondarymenu": "4.1.1",
162
+ "volto-site-settings": "0.4.3",
161
163
  "volto-slimheader": "0.1.2",
162
164
  "volto-social-settings": "3.0.0",
163
165
  "volto-subblocks": "2.1.0",
164
166
  "volto-subfooter": "3.1.1",
165
- "volto-subsites": "4.0.1",
167
+ "volto-subsites": "4.0.2",
166
168
  "volto-venue": "4.1.0",
167
169
  "webpack-image-resize-loader": "^5.0.0"
168
170
  },
@@ -198,7 +200,7 @@
198
200
  "stylelint-prettier": "4.0.2"
199
201
  },
200
202
  "peerDependencies": {
201
- "@plone/volto": "17.18.1"
203
+ "@plone/volto": "17.18.2"
202
204
  },
203
205
  "packageManager": "yarn@3.2.3"
204
206
  }
package/publiccode.yml CHANGED
@@ -227,9 +227,9 @@ maintenance:
227
227
  name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
228
228
  platforms:
229
229
  - web
230
- releaseDate: '2024-07-05'
230
+ releaseDate: '2024-07-16'
231
231
  softwareType: standalone/web
232
- softwareVersion: 11.15.0
232
+ softwareVersion: 11.17.0
233
233
  url: 'https://github.com/italia/design-comuni-plone-theme'
234
234
  usedBy:
235
235
  - ASP Comuni Modenesi Area Nord
@@ -1,16 +1,13 @@
1
1
  import React from 'react';
2
2
  import { useSelector } from 'react-redux';
3
- import { useIntl } from 'react-intl';
4
3
  import { useLocation } from 'react-router-dom';
5
- import { Helmet, BodyClass } from '@plone/volto/helpers';
4
+ import { BodyClass } from '@plone/volto/helpers';
6
5
  import { RemoveBodyClass } from 'design-comuni-plone-theme/components/ItaliaTheme';
7
- import { getSiteProperty } from 'design-comuni-plone-theme/helpers';
8
6
  import ScrollToTop from 'design-comuni-plone-theme/components/ItaliaTheme/ScrollToTop/ScrollToTop';
9
7
  import { SubsiteLoader } from 'volto-subsites';
10
8
  import config from '@plone/volto/registry';
11
9
 
12
10
  const GenericAppExtras = (props) => {
13
- const intl = useIntl();
14
11
  const location = useLocation();
15
12
 
16
13
  const subsite = useSelector((state) => state.subsite?.data);
@@ -19,7 +16,6 @@ const GenericAppExtras = (props) => {
19
16
  if (subsiteLoadable) {
20
17
  subsiteLoadable.load();
21
18
  }
22
- const siteTitle = subsite?.title ?? getSiteProperty('siteTitle', intl.locale);
23
19
 
24
20
  const FORCE_PUBLIC_UI = ['/sitemap', '/search'];
25
21
  const isPublicUI = FORCE_PUBLIC_UI.reduce(
@@ -29,7 +25,6 @@ const GenericAppExtras = (props) => {
29
25
 
30
26
  return (
31
27
  <>
32
- <Helmet titleTemplate={`%s - ${siteTitle}`} />
33
28
  {isPublicUI && (
34
29
  <>
35
30
  <BodyClass className="public-ui" />
@@ -0,0 +1,35 @@
1
+ /*
2
+ CUSTOMIZATIONS:
3
+ - get defaultValue from siteProperties
4
+ */
5
+
6
+ import React from 'react';
7
+ import { useIntl } from 'react-intl';
8
+ import { Helmet } from '@plone/volto/helpers';
9
+ import { SiteProperty } from 'volto-site-settings';
10
+ import { getSiteProperty } from 'design-comuni-plone-theme/helpers';
11
+
12
+ const SiteSettingsExtras = (props) => {
13
+ const intl = useIntl();
14
+ let siteTitle = SiteProperty({
15
+ property: 'site_title',
16
+ getValue: true,
17
+ defaultValue: getSiteProperty('siteTitle', intl.locale),
18
+ });
19
+
20
+ const parentSiteTitle = SiteProperty({
21
+ property: 'site_title',
22
+ getValue: true,
23
+ getParent: true,
24
+ defaultValue: getSiteProperty('parentSiteTitle', intl.locale),
25
+ });
26
+
27
+ if (parentSiteTitle !== siteTitle) {
28
+ siteTitle = siteTitle + ' - ' + parentSiteTitle;
29
+ }
30
+
31
+ siteTitle = siteTitle.replaceAll('\\n', ' - ');
32
+
33
+ return <Helmet titleTemplate={`%s - ${siteTitle}`} />;
34
+ };
35
+ export default SiteSettingsExtras;
@@ -36,6 +36,8 @@ const DefaultFilters = () => {
36
36
  const intl = useIntl();
37
37
  moment.locale(intl.locale);
38
38
  const subsite = useSelector((state) => state.subsite?.data);
39
+ const isSubsiteValid = subsite && Object.keys(subsite).length > 0;
40
+ const path = isSubsiteValid ? flattenToAppURL(subsite['@id']) : '/';
39
41
 
40
42
  return {
41
43
  text_filter: {
@@ -68,7 +70,7 @@ const DefaultFilters = () => {
68
70
  isSearchable: true,
69
71
  options: {
70
72
  dispatch: {
71
- path: subsite ? flattenToAppURL(subsite['@id']) : '/',
73
+ path: path,
72
74
  portal_types: ['Venue'],
73
75
  fullobjects: 0,
74
76
  b_size: 10000,
@@ -41,7 +41,7 @@ const messages = defineMessages({
41
41
 
42
42
  const Slide = (props) => {
43
43
  const intl = useIntl();
44
- const { item, index, appearance, appearanceProp, onKeyDown } = props;
44
+ const { index, appearance, appearanceProp, onKeyDown } = props;
45
45
 
46
46
  const appearances = config.blocks.blocksConfig.listing.variations.filter(
47
47
  (v) => v.id === 'slider',
@@ -50,7 +50,6 @@ const Slide = (props) => {
50
50
 
51
51
  return (
52
52
  <SingleSlideWrapper
53
- key={item['@id'] + index}
54
53
  index={index}
55
54
  onKeyDown={onKeyDown}
56
55
  aria-label={
@@ -130,6 +129,7 @@ const SliderTemplate = ({
130
129
  };
131
130
  return (
132
131
  <El
132
+ key={index}
133
133
  className={`${item.props.className} slick-dot`}
134
134
  tabIndex={-1}
135
135
  title={intl.formatMessage(messages.slideDot, {
@@ -228,6 +228,7 @@ const SliderTemplate = ({
228
228
  const prevIndex = index > 0 ? index - 1 : null;
229
229
  return (
230
230
  <Slide
231
+ key={item['@id'] + index}
231
232
  image={image}
232
233
  index={index}
233
234
  full_width={full_width}
@@ -1,18 +1,50 @@
1
1
  import React from 'react';
2
2
  import cx from 'classnames';
3
3
  import { useIntl } from 'react-intl';
4
+ import { SiteProperty } from 'volto-site-settings';
4
5
  import { getSiteProperty } from 'design-comuni-plone-theme/helpers';
5
6
 
6
- const BrandText = ({ mobile = false, subsite }) => {
7
+ const BrandText = ({ mobile = false, subsite, getParent = false }) => {
7
8
  const intl = useIntl();
9
+ // TODO DEPRECATED: remove and only use SiteProperty
10
+ const deprecatedSiteTitle =
11
+ subsite?.title || getSiteProperty('siteTitle', intl.locale);
12
+ let title =
13
+ deprecatedSiteTitle ||
14
+ SiteProperty({
15
+ property: 'site_title',
16
+ defaultValue: getSiteProperty('siteTitle', intl.locale),
17
+ getValue: true,
18
+ getParent: getParent,
19
+ });
20
+
21
+ // TODO DEPRECATED: remove and only use SiteProperty
22
+ const deprecatedSiteSubtitle =
23
+ subsite?.description || getSiteProperty('siteSubtitle', intl.locale);
24
+ const description =
25
+ deprecatedSiteSubtitle ||
26
+ SiteProperty({
27
+ property: 'site_subtitle',
28
+ defaultValue: getSiteProperty('siteSubtitle', intl.locale),
29
+ getValue: true,
30
+ getParent: getParent,
31
+ });
32
+ const titleSplit = title?.split('\n') ?? null;
33
+ title = titleSplit?.map((t, i) => (
34
+ <React.Fragment key={i}>
35
+ {t}
36
+ {i < titleSplit.length - 1 && <br />}
37
+ </React.Fragment>
38
+ ));
39
+
8
40
  return (
9
41
  <div className="it-brand-text">
10
- <p className="no_toc h2">
11
- {subsite?.title || getSiteProperty('siteTitle', intl.locale)}
12
- </p>
13
- <p className={cx('no_toc h3', { 'd-none d-md-block': !mobile })}>
14
- {subsite?.description || getSiteProperty('siteSubtitle', intl.locale)}
15
- </p>
42
+ {title && <p className="no_toc h2">{title}</p>}
43
+ {description && (
44
+ <p className={cx('no_toc h3', { 'd-none d-md-block': !mobile })}>
45
+ {description}
46
+ </p>
47
+ )}
16
48
  </div>
17
49
  );
18
50
  };
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import { BrandText } from 'design-comuni-plone-theme/components/ItaliaTheme';
3
3
 
4
4
  const BrandTextFooter = () => {
5
- return <BrandText />;
5
+ return <BrandText getParent={true} />;
6
6
  };
7
7
 
8
8
  export default BrandTextFooter;
@@ -21,6 +21,7 @@ import {
21
21
  import { UniversalLink } from '@plone/volto/components';
22
22
  import { Row, Col, BreadcrumbItem } from 'design-react-kit';
23
23
  import GoogleBreadcrumbs from 'design-comuni-plone-theme/components/ItaliaTheme/Breadcrumbs/GoogleBreadcrumbs';
24
+ import { useHomePath } from 'design-comuni-plone-theme/helpers';
24
25
  import config from '@plone/volto/registry';
25
26
 
26
27
  const messages = defineMessages({
@@ -98,6 +99,7 @@ const Breadcrumbs = ({ pathname }) => {
98
99
  items = [];
99
100
  }
100
101
  }
102
+ const homepath = useHomePath();
101
103
 
102
104
  return items?.length > 0 ? (
103
105
  <>
@@ -110,7 +112,7 @@ const Breadcrumbs = ({ pathname }) => {
110
112
  >
111
113
  <ol className="breadcrumb" data-element="breadcrumb">
112
114
  <BreadcrumbItem tag="li">
113
- <UniversalLink href="/">
115
+ <UniversalLink href={homepath}>
114
116
  {intl.formatMessage(messages.home)}
115
117
  </UniversalLink>
116
118
  <span className="separator">/</span>
@@ -17,6 +17,8 @@ import {
17
17
  FooterSocials,
18
18
  } from 'design-comuni-plone-theme/components/ItaliaTheme';
19
19
 
20
+ import { useHomePath } from 'design-comuni-plone-theme/helpers';
21
+
20
22
  const messages = defineMessages({
21
23
  goToPage: {
22
24
  id: 'Vai alla pagina',
@@ -29,7 +31,7 @@ const FooterInfos = () => {
29
31
  const N_COLUMNS = 4;
30
32
  const location = useLocation();
31
33
  const dispatch = useDispatch();
32
-
34
+ const homepath = useHomePath();
33
35
  const footerConfiguration = useSelector(
34
36
  (state) => state.editableFooterColumns?.result,
35
37
  );
@@ -41,7 +43,7 @@ const FooterInfos = () => {
41
43
  //filter rootpaths
42
44
  const footerColumns = getItemsByPath(
43
45
  footerConfiguration,
44
- location?.pathname?.length ? location.pathname : '/',
46
+ location?.pathname?.length ? location.pathname : homepath,
45
47
  );
46
48
 
47
49
  const colWidth =
@@ -7,6 +7,7 @@ import React from 'react';
7
7
  import { Container, Row, Col } from 'design-react-kit';
8
8
 
9
9
  import { UniversalLink } from '@plone/volto/components';
10
+ import { FooterTop } from 'volto-editablefooter';
10
11
  import {
11
12
  FooterNavigation,
12
13
  FooterInfos,
@@ -14,8 +15,7 @@ import {
14
15
  BrandTextFooter,
15
16
  FooterPNRRLogo,
16
17
  } from 'design-comuni-plone-theme/components/ItaliaTheme/';
17
-
18
- import { FooterTop } from 'volto-editablefooter';
18
+ import { useHomePath } from 'design-comuni-plone-theme/helpers';
19
19
 
20
20
  /**
21
21
  * FooterMain component class.
@@ -24,7 +24,7 @@ import { FooterTop } from 'volto-editablefooter';
24
24
  */
25
25
  const FooterMain = () => {
26
26
  const footerTopContent = FooterTop();
27
-
27
+ const homepath = useHomePath();
28
28
  return (
29
29
  <div className="it-footer-main">
30
30
  <Container tag="div">
@@ -35,7 +35,7 @@ const FooterMain = () => {
35
35
  {footerTopContent ?? (
36
36
  <>
37
37
  <FooterPNRRLogo />
38
- <UniversalLink href="/">
38
+ <UniversalLink href={homepath}>
39
39
  <LogoFooter />
40
40
  <BrandTextFooter />
41
41
  </UniversalLink>