From 5215ca95fb6d69297d053463f92a8547b10e36af Mon Sep 17 00:00:00 2001 From: Rok Rejc Date: Mon, 22 Jun 2026 11:19:39 +0200 Subject: [PATCH] Change icon used in aggregations. --- .../WebApp/src/assets/chevron-right.svg | 3 +++ .../WebApp/src/assets/square-checkbox-solid.svg | 4 ++++ .../concordance/ConcordanceAggregationItem.js | 16 ++++++++++++++-- .../ConcordanceAggregationItem.module.scss | 9 +++------ .../Rsdo.Concordancer.Api/WebApp/src/i18n.js | 10 +++++++--- 5 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/chevron-right.svg create mode 100644 src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/square-checkbox-solid.svg diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/chevron-right.svg b/src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/chevron-right.svg new file mode 100644 index 0000000..424b5d0 --- /dev/null +++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/chevron-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/square-checkbox-solid.svg b/src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/square-checkbox-solid.svg new file mode 100644 index 0000000..4502e84 --- /dev/null +++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/assets/square-checkbox-solid.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.js index e0fc648..0bf5ece 100644 --- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.js +++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.js @@ -1,15 +1,27 @@ import { Link } from 'react-router-dom'; import useSearch from '../../hooks/use-search'; import styles from './ConcordanceAggregationItem.module.scss'; +import { useTranslation } from 'react-i18next'; + +import selectIcon from '../../assets/chevron-right.svg'; +import selectedIcon from '../../assets/square-checkbox-solid.svg'; const ConcordanceAggregationItem = (props) => { + const { t } = useTranslation(); const search = useSearch(); const isSelected = search.isFiltered('TextIds', props.filterKey) === true; const link = isSelected ? search.getClearFilterLink('TextIds', props.filterKey) : search.getFilterLink('TextIds', props.filterKey); + let icon; + if (isSelected) { + icon = {t('shared.unselect')}; + } else { + icon = {t('shared.select')}; + } + return ( -
  • {isSelected && X}{props.title}{props.count}
    • +
  • {icon}{props.title}{props.count}
    • ); }; -export default ConcordanceAggregationItem; \ No newline at end of file +export default ConcordanceAggregationItem; diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.module.scss b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.module.scss index f61b0ac..3c2caa4 100644 --- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.module.scss +++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.module.scss @@ -9,16 +9,13 @@ color: $text-color; display: flex; text-decoration: none; - - .remove { - margin-right: 0.8rem; - } - + .title { + margin-left: 1.2rem; flex-grow: 1; margin-right: 0.8rem; overflow: hidden; text-overflow: clip; } } -} \ No newline at end of file +} diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/i18n.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/i18n.js index 722fd3a..cbc2a2d 100644 --- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/i18n.js +++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/i18n.js @@ -22,7 +22,9 @@ const resources = { 'searchError': 'Server returned error when searching.', 'searchHelp': 'Help', 'searchHistory': 'Search history', - 'searchRecords': 'Showing {{start}}-{{end}} from {{total}} records.' + 'searchRecords': 'Showing {{start}}-{{end}} from {{total}} records.', + 'select': 'Select', + 'unselect': 'Remove selected' }, concordance: { 'title': 'Search concordances', @@ -63,7 +65,9 @@ const resources = { 'searchError': 'Strežnik je vrnil napako pri iskanju.', 'searchHelp': 'Pomoč', 'searchHistory': 'Zgodovina iskanj', - 'searchRecords': 'Prikazujem {{start}}-{{end}} od {{total}} zapisov.' + 'searchRecords': 'Prikazujem {{start}}-{{end}} od {{total}} zapisov.', + 'select': 'Izberi', + 'unselect': 'Odstrani izbrano' }, concordance: { 'title': 'Iskanje po konkordancah', @@ -96,4 +100,4 @@ i18n } }); -export default i18n; \ No newline at end of file +export default i18n;