From 1520b8c62f4b30376decacc47834ca46024367a6 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 16 Feb 2023 14:37:30 +0100 Subject: [PATCH] Menu improvements --- pandora_console/general/main_menu.php | 8 ++++ pandora_console/images/menu/about.svg | 2 +- pandora_console/images/menu/admin_tools.svg | 2 +- pandora_console/images/menu/alerts.svg | 2 +- pandora_console/images/menu/configuration.svg | 2 +- pandora_console/images/menu/discovery.svg | 2 +- pandora_console/images/menu/events.svg | 2 +- pandora_console/images/menu/events_2.svg | 2 +- pandora_console/images/menu/library.svg | 2 +- pandora_console/images/menu/links.svg | 2 +- pandora_console/images/menu/monitoring.svg | 2 +- pandora_console/images/menu/network.svg | 2 +- pandora_console/images/menu/reporting.svg | 2 +- pandora_console/images/menu/resources.svg | 2 +- pandora_console/images/menu/servers.svg | 2 +- pandora_console/images/menu/settings.svg | 2 +- pandora_console/images/menu/tools.svg | 2 +- pandora_console/images/menu/users.svg | 2 +- pandora_console/images/menu/warp_update.svg | 2 +- pandora_console/images/menu/workspace.svg | 2 +- pandora_console/include/styles/menu.css | 41 ++++++++++++++++++- pandora_console/include/styles/pandora.css | 1 + 22 files changed, 68 insertions(+), 20 deletions(-) diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 60e351646f..af93f5f0b7 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -104,10 +104,14 @@ echo ''; $('#tab_line_2').addClass('tabs_selected'); $('#div_display').css('display', 'none'); $('#div_management').css('display', 'block'); + $('#tab_display').addClass('head_tab_unselected').removeClass('head_tab_selected'); + $('#tab_management').addClass('head_tab_selected').removeClass('head_tab_unselected'); $('#tab_collapsed_display').children().first().removeClass('tabs_collapsed_display'); $('#tab_collapsed_display').children().first().addClass('tabs_collapsed_oval'); } else { $('#tab_line_1').addClass('tabs_selected'); + $('#tab_management').addClass('head_tab_unselected').removeClass('head_tab_selected'); + $('#tab_display').addClass('head_tab_selected').removeClass('head_tab_unselected'); $('#tab_collapsed_management').children().first().removeClass('tabs_collapsed_management'); $('#tab_collapsed_management').children().first().addClass('tabs_collapsed_oval'); } @@ -117,6 +121,8 @@ echo ''; $('#tab_line_2').removeClass('tabs_selected'); $('#div_management').css('display', 'none'); $('#div_display').css('display', 'block'); + $('#tab_management').addClass('head_tab_unselected').removeClass('head_tab_selected'); + $('#tab_display').addClass('head_tab_selected').removeClass('head_tab_unselected'); $('#tab_collapsed_management').children().first().removeClass('tabs_collapsed_management'); $('#tab_collapsed_management').children().first().addClass('tabs_collapsed_oval'); $('#tab_collapsed_display').children().first().removeClass('tabs_collapsed_oval'); @@ -128,6 +134,8 @@ echo ''; $('#tab_line_1').removeClass('tabs_selected'); $('#div_display').css('display', 'none'); $('#div_management').css('display', 'block'); + $('#tab_display').addClass('head_tab_unselected').removeClass('head_tab_selected'); + $('#tab_management').addClass('head_tab_selected').removeClass('head_tab_unselected'); $('#tab_collapsed_display').children().first().removeClass('tabs_collapsed_display'); $('#tab_collapsed_display').children().first().addClass('tabs_collapsed_oval'); $('#tab_collapsed_management').children().first().removeClass('tabs_collapsed_oval'); diff --git a/pandora_console/images/menu/about.svg b/pandora_console/images/menu/about.svg index 337334a1ed..5927f920e0 100644 --- a/pandora_console/images/menu/about.svg +++ b/pandora_console/images/menu/about.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu About@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/admin_tools.svg b/pandora_console/images/menu/admin_tools.svg index 0f1982e29e..1970c5144c 100644 --- a/pandora_console/images/menu/admin_tools.svg +++ b/pandora_console/images/menu/admin_tools.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Admin tools@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/alerts.svg b/pandora_console/images/menu/alerts.svg index ffbaaf5784..8a155e89dc 100644 --- a/pandora_console/images/menu/alerts.svg +++ b/pandora_console/images/menu/alerts.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Alerts@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/configuration.svg b/pandora_console/images/menu/configuration.svg index 9ea84be913..93f95fe84f 100644 --- a/pandora_console/images/menu/configuration.svg +++ b/pandora_console/images/menu/configuration.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Configuration@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/discovery.svg b/pandora_console/images/menu/discovery.svg index ce9b9c14a7..28e7ec6e9b 100644 --- a/pandora_console/images/menu/discovery.svg +++ b/pandora_console/images/menu/discovery.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Discovery@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/events.svg b/pandora_console/images/menu/events.svg index e49de38f9e..539d37363e 100644 --- a/pandora_console/images/menu/events.svg +++ b/pandora_console/images/menu/events.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Events@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/events_2.svg b/pandora_console/images/menu/events_2.svg index 9dfda2c339..cf25dd92cf 100644 --- a/pandora_console/images/menu/events_2.svg +++ b/pandora_console/images/menu/events_2.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Events v2@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/library.svg b/pandora_console/images/menu/library.svg index 22b63e46ab..6e93b65a9c 100644 --- a/pandora_console/images/menu/library.svg +++ b/pandora_console/images/menu/library.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Library@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/links.svg b/pandora_console/images/menu/links.svg index 1bae8dae22..5526afe319 100644 --- a/pandora_console/images/menu/links.svg +++ b/pandora_console/images/menu/links.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Links@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/monitoring.svg b/pandora_console/images/menu/monitoring.svg index f83a4eadba..0f11c75aec 100644 --- a/pandora_console/images/menu/monitoring.svg +++ b/pandora_console/images/menu/monitoring.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Monitoring@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/network.svg b/pandora_console/images/menu/network.svg index cc508853e2..1ee7326622 100644 --- a/pandora_console/images/menu/network.svg +++ b/pandora_console/images/menu/network.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Topology@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/reporting.svg b/pandora_console/images/menu/reporting.svg index 61b3386cc2..13da7d5090 100644 --- a/pandora_console/images/menu/reporting.svg +++ b/pandora_console/images/menu/reporting.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Reporting@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/resources.svg b/pandora_console/images/menu/resources.svg index 75f787bd77..f787cdb33e 100644 --- a/pandora_console/images/menu/resources.svg +++ b/pandora_console/images/menu/resources.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Resources@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/servers.svg b/pandora_console/images/menu/servers.svg index 7769da6443..114185ba32 100644 --- a/pandora_console/images/menu/servers.svg +++ b/pandora_console/images/menu/servers.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Servers@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/settings.svg b/pandora_console/images/menu/settings.svg index a504e08ead..e72657b7ea 100644 --- a/pandora_console/images/menu/settings.svg +++ b/pandora_console/images/menu/settings.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Settings@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/tools.svg b/pandora_console/images/menu/tools.svg index 0b5ff9ab33..b0f6203873 100644 --- a/pandora_console/images/menu/tools.svg +++ b/pandora_console/images/menu/tools.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Tools@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/users.svg b/pandora_console/images/menu/users.svg index c8a2ab66ef..caf8b6f04c 100644 --- a/pandora_console/images/menu/users.svg +++ b/pandora_console/images/menu/users.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Users@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/warp_update.svg b/pandora_console/images/menu/warp_update.svg index 69160d7d88..e5a74da2cc 100644 --- a/pandora_console/images/menu/warp_update.svg +++ b/pandora_console/images/menu/warp_update.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Warp Update@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/images/menu/workspace.svg b/pandora_console/images/menu/workspace.svg index 98cce2944d..4560f375d5 100644 --- a/pandora_console/images/menu/workspace.svg +++ b/pandora_console/images/menu/workspace.svg @@ -4,6 +4,6 @@ Dark / 20 / Menu Workspace@svg Created with Sketch. - + \ No newline at end of file diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 5517e1eb17..beaecb1615 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -236,98 +236,121 @@ /* Icons specified here */ .icon_oper-networkconsole { background: url(../../images/menu/network.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_oper-agents { background: url(../../images/menu/monitoring.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_oper-events { background: url(../../images/menu/events.svg) no-repeat 50% 50%; + background-size: 18px; } /* users */ .icon_oper-users { background: url(../../images/menu/workspace.svg) no-repeat 50% 50%; + background-size: 18px; } /* trap console */ .icon_oper-snmpc, .icon_god-snmpc { background: url(../../images/menu/op_snmp.menu.png) no-repeat 50% 50%; + background-size: 18px; } .icon_oper-reporting { background: url(../../images/menu/reporting.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_oper-gismaps { background: url(../../images/menu/op_gis.menu.png) no-repeat 50% 50%; + background-size: 18px; } .icon_oper-netflow { background: url(../../images/menu/op_netflow.menu.png) no-repeat 50% 50%; + background-size: 18px; } .icon_oper-extensions { background: url(../../images/menu/tools.svg) no-repeat 50% 50%; + background-size: 18px; } /* Godmode images */ .icon_god-discovery { background: url(../../images/menu/discovery.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-resources { background: url(../../images/menu/resources.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-configuration { background: url(../../images/menu/configuration.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-alerts { background: url(../../images/menu/alerts.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-users { background: url(../../images/menu/users.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-reporting { background: url(../../images/menu/reporting_edit.menu.png) no-repeat 50% 50%; + background-size: 18px; } .icon_god-servers { background: url(../../images/menu/servers.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-setup { background: url(../../images/menu/settings.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-events { background: url(../../images/menu/events_2.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-extensions { background: url(../../images/menu/admin_tools.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-links { background: url(../../images/menu/links.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-um_messages { background: url(../../images/menu/warp_update.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_god-module_library { background: url(../../images/menu/library.svg) no-repeat 50% 50%; + background-size: 18px; } .icon_about { background: url(../../images/menu/about.svg) no-repeat 50% 50%; + background-size: 18px; } #menu_container { @@ -471,6 +494,14 @@ ul li { display: flex !important; } +.submenu_text, +.span_has_menu_text, +.title_menu_classic span { + font-size: 14px; + font-weight: normal; + letter-spacing: -0.3px; + height: 18px; +} .menu_icon_collapsed { background-position: 50% 50%; } @@ -602,7 +633,7 @@ ul li { .span_selected { color: #1d7874 !important; - font-weight: bold; + font-weight: bold !important; } .tabs_collapsed { @@ -657,3 +688,11 @@ ul li { .logo_icon { margin-left: 16px; } + +.head_tab_selected span { + color: #161628; +} + +.head_tab_unselected span { + color: #95a3bf; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 035358ba35..8946ba479b 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11190,4 +11190,5 @@ form#satellite_conf_edit > fieldset.full-column { font-size: 13px; text-align: center; width: 70%; + margin-top: 5px; }