From d51de65504199cc5dd6c26afa9420af97cf11861 Mon Sep 17 00:00:00 2001 From: palajsamuel Date: Wed, 30 Sep 2026 15:02:31 +0200 Subject: [PATCH 1/2] [NAE-2468] UI/UX fixes & improvements - removed default values of fields icon_color and font_color in dashboard_item.xml - added toolbar_color field to dashboard_management.xml --- .../engine-processes/dashboard_item.xml | 2 -- .../engine-processes/dashboard_management.xml | 27 +++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/resources/petriNets/engine-processes/dashboard_item.xml b/src/main/resources/petriNets/engine-processes/dashboard_item.xml index fc450e2f68..b4f043abe1 100644 --- a/src/main/resources/petriNets/engine-processes/dashboard_item.xml +++ b/src/main/resources/petriNets/engine-processes/dashboard_item.xml @@ -231,7 +231,6 @@ icon_color Icon color Icon color of item. Valid CSS property value font-color. - #0790ff icon_color_set @@ -284,7 +283,6 @@ font_color Font color Font color of item name. Valid CSS property value font-color. - #0790ff font_weight diff --git a/src/main/resources/petriNets/engine-processes/dashboard_management.xml b/src/main/resources/petriNets/engine-processes/dashboard_management.xml index 85992519db..0d54f327cb 100644 --- a/src/main/resources/petriNets/engine-processes/dashboard_management.xml +++ b/src/main/resources/petriNets/engine-processes/dashboard_management.xml @@ -72,6 +72,11 @@ Dashboard logo to be displayed in application dashboard assets/img/netgrif_full_white.svg + + toolbar_color + Toolbar color + Dashboard toolbar color + dashboard_item_list Dashboard items @@ -368,6 +373,8 @@ Názov panelu, ktorý bude zobrazený v panely aplikácie Logo panelu Logo panelu, ktoré bude zobrazené v panely aplikácie + Farba vrchného panelu + Farba vrchného panelu dashboardu Položky panelu Zoznam položiek panalu, ktoré budú zobrazené v panely aplikácie Existujúce položky panelu @@ -398,6 +405,8 @@ Name des Dashboards, der im Dashboard der Anwendung angezeigt werden soll Logo für das Armaturenbrett Dashboard-Logo, das im Dashboard der Anwendung angezeigt werden soll + Farbe der Symbolleiste + Farbe der Dashboard-Symbolleiste Dashboard-Elemente Liste der Dashboard-Elemente, die im Dashboard der Anwendung angezeigt werden sollen Vorhandene Dashboard-Elemente @@ -463,8 +472,8 @@ editable - 0 - 1 + 2 + 0 1 2 @@ -677,6 +686,20 @@ 8 1 4 + + outline + + + + toolbar_color + + editable + + + 0 + 1 + 1 + 2 outline From 5afdafa2de3773d15e8e0493c7951d2860271aa2 Mon Sep 17 00:00:00 2001 From: palajsamuel Date: Thu, 1 Oct 2026 09:39:22 +0200 Subject: [PATCH 2/2] [NAE-2468] UI/UX fixes & improvements - implemented support for newly added field toolbar_color to DashboardManagementBody and DashboardManagementConstants --- .../menu/domain/dashboard/DashboardManagementBody.java | 8 ++++++++ .../domain/dashboard/DashboardManagementConstants.java | 1 + 2 files changed, 9 insertions(+) diff --git a/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementBody.java b/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementBody.java index 8f8aa25da7..c4d99f656d 100644 --- a/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementBody.java +++ b/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementBody.java @@ -53,6 +53,11 @@ public class DashboardManagementBody { */ private boolean logoutDashboard = false; + /** + * color of dashboard toolbar + * */ + private String toolbarColor = null; + public DashboardManagementBody(String id, I18nString name) { this.id = id; @@ -70,6 +75,9 @@ public ToDataSetOutcome toDataSet() { if (this.logo != null) { outcome.putDataSetEntry(DashboardManagementConstants.FIELD_LOGO, FieldType.TEXT, this.logo); } + if (this.toolbarColor != null) { + outcome.putDataSetEntry(DashboardManagementConstants.FIELD_TOOLBAR_COLOR, FieldType.TEXT, this.toolbarColor); + } outcome.putDataSetEntry(DashboardManagementConstants.FIELD_SIMPLE_DASHBOARD, FieldType.BOOLEAN, this.simpleDashboard); outcome.putDataSetEntry(DashboardManagementConstants.FIELD_PROFILE_DASHBOARD, FieldType.BOOLEAN, this.profileDashboard); outcome.putDataSetEntry(DashboardManagementConstants.FIELD_LANGUAGE_DASHBOARD, FieldType.BOOLEAN, this.profileDashboard); diff --git a/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementConstants.java b/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementConstants.java index 0b92226172..364fa403e4 100644 --- a/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementConstants.java +++ b/src/main/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementConstants.java @@ -17,4 +17,5 @@ public class DashboardManagementConstants { public static final String FIELD_LOGOUT_DASHBOARD = "logout_dashboard_toolbar"; public static final String FIELD_ITEMS_ORDER = "items_order"; public static final String FIELD_ADD_NEW_ITEM = "add_new_item"; + public static final String FIELD_TOOLBAR_COLOR = "toolbar_color"; }