From 0be18c7a1cec86cb64ad0ca5195f742c0536c264 Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:55:22 +0100 Subject: [PATCH 1/4] IBX-7163: Remove Bootstrap classes --- .../views/themes/admin/ui/dashboard/block/all.html.twig | 2 +- .../views/themes/admin/ui/dashboard/block/me.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig index 49c4aed960..e3c892fd1b 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig @@ -2,7 +2,7 @@ {% set parameters = parameters|default({})|merge({ hide_toggler: true }) %} -
+
{{ 'everyone'|trans|desc('Common content') }}
{{ ibexa_render_component_group('dashboard-all-tab-groups', parameters) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig index c04e5daaab..7aba57c7c4 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig @@ -2,7 +2,7 @@ {% set parameters = parameters|default({})|merge({ hide_toggler: true }) %} -
+
{{ 'me'|trans|desc('My content') }}
{{ ibexa_render_component_group('dashboard-my-tab-groups', parameters) }} From 4988d235ed6edef685b1467ed48cde61d03465fa Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Sat, 25 Nov 2023 19:41:59 +0100 Subject: [PATCH 2/4] remove focus on tooltip --- .../Resources/public/js/scripts/helpers/tooltips.helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js b/src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js index c82c368ca3..32cd2bf521 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js @@ -120,7 +120,7 @@ }; const extraClass = tooltipNode.dataset.tooltipExtraClass ?? ''; const placement = tooltipNode.dataset.tooltipPlacement ?? 'bottom'; - const trigger = tooltipNode.dataset.tooltipTrigger ?? 'hover focus'; + const trigger = tooltipNode.dataset.tooltipTrigger ?? 'hover'; const useHtml = tooltipNode.dataset.tooltipUseHtml !== undefined; const container = tooltipNode.dataset.tooltipContainerSelector ? tooltipNode.closest(tooltipNode.dataset.tooltipContainerSelector) From 4f14e9fbe7a993f9a678f41692c0488834a134a4 Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:49:31 +0100 Subject: [PATCH 3/4] Implemented empty chart --- .../Resources/public/scss/_empty-chart.scss | 19 +++++++++++++++++++ src/bundle/Resources/public/scss/ibexa.scss | 1 + .../themes/admin/ui/empty_chart.html.twig | 10 ++++++++++ 3 files changed, 30 insertions(+) create mode 100644 src/bundle/Resources/public/scss/_empty-chart.scss create mode 100644 src/bundle/Resources/views/themes/admin/ui/empty_chart.html.twig diff --git a/src/bundle/Resources/public/scss/_empty-chart.scss b/src/bundle/Resources/public/scss/_empty-chart.scss new file mode 100644 index 0000000000..1484f3e577 --- /dev/null +++ b/src/bundle/Resources/public/scss/_empty-chart.scss @@ -0,0 +1,19 @@ +.ibexa-chart-no-data { + padding: calculateRem(16px); + margin: 0; + + &__wrapper { + display: flex; + justify-content: center; + align-items: center; + } + + &__label { + margin-left: calculateRem(56px); + margin-bottom: calculateRem(16px); + font-weight: $headings-font-weight; + font-size: $h2-font-size; + font-family: $ibexa-font-family-headings; + color: $ibexa-color-dark-400; + } +} diff --git a/src/bundle/Resources/public/scss/ibexa.scss b/src/bundle/Resources/public/scss/ibexa.scss index f6ecd82ed7..37ada5c2fe 100644 --- a/src/bundle/Resources/public/scss/ibexa.scss +++ b/src/bundle/Resources/public/scss/ibexa.scss @@ -31,6 +31,7 @@ @import 'content-type-edit'; @import 'card'; @import 'chart'; +@import 'empty-chart'; @import 'alerts'; @import 'pagination'; @import 'error-page'; diff --git a/src/bundle/Resources/views/themes/admin/ui/empty_chart.html.twig b/src/bundle/Resources/views/themes/admin/ui/empty_chart.html.twig new file mode 100644 index 0000000000..360457e933 --- /dev/null +++ b/src/bundle/Resources/views/themes/admin/ui/empty_chart.html.twig @@ -0,0 +1,10 @@ +
+
+ {{ 'dashboard.charts.no_results'|trans|desc('No results found') }} + {{ 'dashboard.charts.no_results'|trans|desc('No results found') }} +
+
From 94ce893327ccef56b047c257bfbc1d9faf06f040 Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:22:14 +0100 Subject: [PATCH 4/4] Added translations --- src/bundle/Resources/translations/messages.en.xliff | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index 774cc0dbb5..78c7a2faac 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -256,6 +256,11 @@ for the selected period]]> key: dashboard.charts.no_data + + No results found + No results found + key: dashboard.charts.no_results + Clear (%selected_items_count%) Clear (%selected_items_count%)