Skip to content

[NAE-2468] UI/UX fixes & improvements #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SamuelPalaj wants to merge 3 commits into
base: release/6.6.0
Choose a base branch
from
Open

[NAE-2468] UI/UX fixes & improvements #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d51de65
[NAE-2468] UI/UX fixes & improvements
SamuelPalaj Sep 30, 2026
6995629
Merge branch 'release/6.6.0' into NAE-2468
SamuelPalaj Sep 30, 2026
5afdafa
[NAE-2468] UI/UX fixes & improvements
SamuelPalaj Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...in/java/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
1 change: 1 addition & 0 deletions ...va/com/netgrif/application/engine/menu/domain/dashboard/DashboardManagementConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
2 changes: 0 additions & 2 deletions src/main/resources/petriNets/engine-processes/dashboard_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
<id>icon_color</id>
<title name="icon_color">Icon color</title>
<desc name="icon_color_desc">Icon color of item. Valid CSS property value font-color.</desc>
<init>#0790ff</init>
<event type="set">
<id>icon_color_set</id>
<actions phase="post">
Expand Down Expand Up @@ -284,7 +283,6 @@
<id>font_color</id>
<title name="font_color">Font color</title>
<desc name="font_color_desc">Font color of item name. Valid CSS property value font-color.</desc>
<init>#0790ff</init>
</data>
<data type="text" immediate="true">
<id>font_weight</id>
Expand Down
27 changes: 25 additions & 2 deletions src/main/resources/petriNets/engine-processes/dashboard_management.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
<desc name="dashboard_logo_desc">Dashboard logo to be displayed in application dashboard</desc>
<init>assets/img/netgrif_full_white.svg</init>
</data>
<data type="text" immediate="true">
<id>toolbar_color</id>

@Retoocs Retoocs Sep 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field needs to be added to DashboardManagementBody (as attribute and use it in method toDataSet) and also in DashboardManagementConstants

<title name="toolbar_color">Toolbar color</title>
<desc name="toolbar_color_desc">Dashboard toolbar color</desc>
</data>
<data type="enumeration_map" immediate="true">
<id>dashboard_item_list</id>
<title name="dashboard_item_list">Dashboard items</title>
Expand Down Expand Up @@ -368,6 +373,8 @@
<i18nString name="dashboard_name_desc">Názov panelu, ktorý bude zobrazený v panely aplikácie</i18nString>
<i18nString name="dashboard_logo">Logo panelu</i18nString>
<i18nString name="dashboard_logo_desc">Logo panelu, ktoré bude zobrazené v panely aplikácie</i18nString>
<i18nString name="toolbar_color">Farba vrchného panelu</i18nString>
<i18nString name="toolbar_color_desc">Farba vrchného panelu dashboardu</i18nString>
<i18nString name="dashboard_item_list">Položky panelu</i18nString>
<i18nString name="dashboard_item_list_desc">Zoznam položiek panalu, ktoré budú zobrazené v panely aplikácie</i18nString>
<i18nString name="existing_menu_items">Existujúce položky panelu</i18nString>
Expand Down Expand Up @@ -398,6 +405,8 @@
<i18nString name="dashboard_name_desc">Name des Dashboards, der im Dashboard der Anwendung angezeigt werden soll</i18nString>
<i18nString name="dashboard_logo">Logo für das Armaturenbrett</i18nString>
<i18nString name="dashboard_logo_desc">Dashboard-Logo, das im Dashboard der Anwendung angezeigt werden soll</i18nString>
<i18nString name="toolbar_color">Farbe der Symbolleiste</i18nString>
<i18nString name="toolbar_color_desc">Farbe der Dashboard-Symbolleiste</i18nString>
<i18nString name="dashboard_item_list">Dashboard-Elemente</i18nString>
<i18nString name="dashboard_item_list_desc">Liste der Dashboard-Elemente, die im Dashboard der Anwendung angezeigt werden sollen</i18nString>
<i18nString name="existing_menu_items">Vorhandene Dashboard-Elemente</i18nString>
Expand Down Expand Up @@ -463,8 +472,8 @@
<behavior>editable</behavior>
</logic>
<layout>
<x>0</x>
<y>1</y>
<x>2</x>
<y>0</y>
<rows>1</rows>
<cols>2</cols>
<template>material</template>
Expand Down Expand Up @@ -677,6 +686,20 @@
<y>8</y>
<rows>1</rows>
<cols>4</cols>
<template>material</template>
<appearance>outline</appearance>
</layout>
</dataRef>
<dataRef>
<id>toolbar_color</id>
<logic>
<behavior>editable</behavior>
</logic>
<layout>
<x>0</x>
<y>1</y>
<rows>1</rows>
<cols>2</cols>
<template>material</template>
<appearance>outline</appearance>
</layout>
Expand Down
Loading