Skip to content

Commit

Permalink
Merge branch 'v2' into us53491_bandi_changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SaraBianchi committed Mar 28, 2024
2 parents 6175c46 + c8b7440 commit 38d864b
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 19 deletions.
5 changes: 5 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
### Novità

- Aggiunto nuovo filtro per Data di chiusura del procedimento nel blocco di ricerca Bandi
### Migliorie

- Migliorata l'accessibilità del bottone "Cerca".
- Migliorata l'accessibilità del blocco Icone.
- Migliorata l'accessibilità per la customer satisfaction.

### Fix

Expand Down
4 changes: 2 additions & 2 deletions locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ msgid "customer_satisfaction"
msgstr ""

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: No
# defaultMessage: No, it was not useful
msgid "customer_satisfaction_no"
msgstr ""

Expand All @@ -1461,7 +1461,7 @@ msgid "customer_satisfaction_title"
msgstr ""

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Yes
# defaultMessage: Yes, it was useful
msgid "customer_satisfaction_yes"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@ msgid "customer_satisfaction"
msgstr ""

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: No
# defaultMessage: No, it was not useful
msgid "customer_satisfaction_no"
msgstr ""

Expand All @@ -1446,7 +1446,7 @@ msgid "customer_satisfaction_title"
msgstr ""

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Yes
# defaultMessage: Yes, it was useful
msgid "customer_satisfaction_yes"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions locales/es/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ msgid "customer_satisfaction"
msgstr "Resultados de las encuestas de satisfacción del cliente"

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: No
# defaultMessage: No, it was not useful
msgid "customer_satisfaction_no"
msgstr "No"

Expand All @@ -1455,7 +1455,7 @@ msgid "customer_satisfaction_title"
msgstr "¿Fue esta página útil para usted?"

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Yes
# defaultMessage: Yes, it was useful
msgid "customer_satisfaction_yes"
msgstr "Sí"

Expand Down
4 changes: 2 additions & 2 deletions locales/fr/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ msgid "customer_satisfaction"
msgstr "Résultats des enquêtes de satisfaction client"

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: No
# defaultMessage: No, it was not useful
msgid "customer_satisfaction_no"
msgstr "No"

Expand All @@ -1463,7 +1463,7 @@ msgid "customer_satisfaction_title"
msgstr "Est-ce que cette page vous a été utile?"

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Yes
# defaultMessage: Yes, it was useful
msgid "customer_satisfaction_yes"
msgstr "Oui"

Expand Down
8 changes: 4 additions & 4 deletions locales/it/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1421,9 +1421,9 @@ msgid "customer_satisfaction"
msgstr "Risultati indagini di customer satisfaction"

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: No
# defaultMessage: No, it was not useful
msgid "customer_satisfaction_no"
msgstr "No"
msgstr "No, questa pagina non mi è stata utile."

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Submit your comment
Expand All @@ -1446,9 +1446,9 @@ msgid "customer_satisfaction_title"
msgstr "Questa pagina ti è stata utile?"

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Yes
# defaultMessage: Yes, it was useful
msgid "customer_satisfaction_yes"
msgstr "Sì"
msgstr "Sì, questa pagina mi è stata utile"

#: components/ItaliaTheme/View/Commons/PageHeader/PageHeaderEventDates
# defaultMessage: dal {dateStart} fino a conclusione
Expand Down
6 changes: 3 additions & 3 deletions 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-03-28T11:59:45.871Z\n"
"POT-Creation-Date: 2024-03-15T14:43:53.376Z\n"
"Last-Translator: Plone i18n <[email protected]>\n"
"Language-Team: Plone i18n <[email protected]>\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1423,7 +1423,7 @@ msgid "customer_satisfaction"
msgstr ""

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: No
# defaultMessage: No, it was not useful
msgid "customer_satisfaction_no"
msgstr ""

Expand All @@ -1448,7 +1448,7 @@ msgid "customer_satisfaction_title"
msgstr ""

#: components/ItaliaTheme/CustomerSatisfaction/CustomerSatisfaction
# defaultMessage: Yes
# defaultMessage: Yes, it was useful
msgid "customer_satisfaction_yes"
msgstr ""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const ViewBlock = ({ data, isOpen, toggle, id, index }) => {
<CardBody tag="div">
{data.icon?.length > 0 && (
<div className="iconblock-icon">
<Icon icon={data.icon} />
<Icon icon={data.icon} aria-hidden={true} />
</div>
)}

Expand Down Expand Up @@ -69,6 +69,11 @@ const ViewBlock = ({ data, isOpen, toggle, id, index }) => {
tag={UniversalLink}
href={data.href ?? '#'}
text={data.linkMoreTitle || intl.formatMessage(messages.vedi)}
aria-label={
data.linkMoreTitle
? data.linkMoreTitle
: intl.formatMessage(messages.vedi) + ' ' + data.title
}
/>
)}
</CardBody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const messages = defineMessages({
},
yes: {
id: 'customer_satisfaction_yes',
defaultMessage: 'Yes',
defaultMessage: 'Yes, it was useful',
},
no: {
id: 'customer_satisfaction_no',
defaultMessage: 'No',
defaultMessage: 'No, it was not useful',
},
suggestions_placeholder: {
id: 'customer_satisfaction_suggestions_placeholder',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const HeaderSearch = () => {
e.preventDefault();
setShowSearchModal(true);
}}
href="#search"
href="/search"
role="button"
>
<Icon icon="it-search" />
</a>
Expand Down
1 change: 1 addition & 0 deletions src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const FontAwesomeIcon = (props) => {
? `<title>${title}</title>${loadedIcon.content}`
: loadedIcon.content,
}}
aria-hidden={props['aria-hidden']}
/>
) : icon ? (
<span className={`icon fa-icon placeholder ${className ?? ''}`}></span>
Expand Down
17 changes: 17 additions & 0 deletions theme/ItaliaTheme/Subsites/ItaliaTheme/Blocks/_iconBlocks.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@use '../../all_variables' as *;

@mixin iconBlocks($subsite-primary, $subsite-secondary) {
.block.iconBlocks {
.background-image {
&.primary:after {
background-color: rgba($subsite-primary, 0.85);
}
&.secondary:after {
background-color: rgba($subsite-secondary, 0.85);
}
&.transparent:after {
background-color: none;
}
}
}
}
2 changes: 2 additions & 0 deletions theme/ItaliaTheme/Subsites/_mixin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
@use 'ItaliaTheme/Blocks/tableOfContents' as it-table-contents;
@use 'ItaliaTheme/Blocks/searchSections' as it-search-sections;
@use 'ItaliaTheme/Blocks/info' as it-info;
@use 'ItaliaTheme/Blocks/iconBlocks' as it-iconBlocks;
@use 'ItaliaTheme/Views/common' as it-views;
@use 'ItaliaTheme/common' as it-common;
@use 'ItaliaTheme/cms-ui' as it-cms-ui;
Expand Down Expand Up @@ -121,6 +122,7 @@
$subsite-secondary,
$subsite-light-theme
);
@include it-iconBlocks.iconBlocks($subsite-primary, $subsite-secondary);

@include it-views.common(
$subsite-primary,
Expand Down

0 comments on commit 38d864b

Please sign in to comment.