diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 3ce49b646a..5a745fa496 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -26,38 +26,21 @@
* ============================================================================
*/
-use function PHPSTORM_META\map;
-
// Begin.
if (isset($config['id_user']) === false) {
include 'general/login_page.php';
exit();
}
-?>
-
-', $menuTypeClass);
+
$url_logo = ui_get_full_url('index.php');
if (is_reporting_console_node() === true) {
$url_logo = 'index.php?logged=1&sec=discovery&sec2=godmode/servers/discovery&wiz=tasklist';
@@ -76,311 +59,383 @@ html_print_div(
),
],
true
- ),
+ ).'
',
]
);
-require 'operation/menu.php';
-require 'godmode/menu.php';
+$display_classic = '';
+$display_collapsed = 'display: none;';
+if ($menuTypeClass === 'collapsed') {
+ $display_classic = 'display: none;';
+ $display_collapsed = '';
+}
-html_print_div(
- [
- 'id' => 'button_collapse',
- 'class' => sprintf('button_collapse button_%s', $menuTypeClass),
- ]
-);
+
+// Tabs.
+echo '';
-// Menu_container.
-ui_require_jquery_file('cookie');
-$config_fixed_header = false;
-if (isset($config['fixed_header']) === true) {
- $config_fixed_header = $config['fixed_header'];
-}
+echo '';
+require 'operation/menu.php';
+echo '
';
+echo '';
+require 'godmode/menu.php';
+echo '
';
+echo '';
?>
-
-
-
diff --git a/pandora_console/general/new_main_menu.php b/pandora_console/general/new_main_menu.php
deleted file mode 100644
index ec5a39a444..0000000000
--- a/pandora_console/general/new_main_menu.php
+++ /dev/null
@@ -1,355 +0,0 @@
-', $menuTypeClass);
-
-$url_logo = ui_get_full_url('index.php');
-if (is_reporting_console_node() === true) {
- $url_logo = 'index.php?logged=1&sec=discovery&sec2=godmode/servers/discovery&wiz=tasklist';
-}
-
-// Header logo.
-html_print_div(
- [
- 'class' => 'logo_green',
- 'content' => html_print_anchor(
- [
- 'href' => $url_logo,
- 'content' => html_print_header_logo_image(
- $menuCollapsed,
- true
- ),
- ],
- true
- ).'',
- ]
-);
-
-$display_classic = '';
-$display_collapsed = 'display: none;';
-if ($menuTypeClass === 'collapsed') {
- $display_classic = 'display: none;';
- $display_collapsed = '';
-}
-
-
-// Tabs.
-echo '';
-
-echo '';
-require 'operation/menu.php';
-echo '
';
-echo '';
-require 'godmode/menu.php';
-echo '
';
-echo '';
-?>
-
\ No newline at end of file
diff --git a/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.png b/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.png
index 494003c145..2ece89fbe5 100644
Binary files a/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.png and b/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.png differ
diff --git a/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.svg b/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.svg
new file mode 100644
index 0000000000..795ace8ef0
--- /dev/null
+++ b/pandora_console/images/custom_logo/logo-default-pandorafms-collapsed.svg
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/menu/display.svg b/pandora_console/images/menu/display.svg
new file mode 100644
index 0000000000..fd3846b86c
--- /dev/null
+++ b/pandora_console/images/menu/display.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/menu/expandir.svg b/pandora_console/images/menu/expandir.svg
new file mode 100644
index 0000000000..51ca03761b
--- /dev/null
+++ b/pandora_console/images/menu/expandir.svg
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/menu/management.svg b/pandora_console/images/menu/management.svg
new file mode 100644
index 0000000000..92ec542be3
--- /dev/null
+++ b/pandora_console/images/menu/management.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 31c2e5214a..6824aa5a77 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4392,7 +4392,7 @@ function html_print_header_logo_image(bool $menuCollapsed, bool $return=false)
true,
[
'border' => '0',
- 'width' => '60',
+ 'width' => '35',
'alt' => $logo_title,
'class' => 'logo_icon',
'style' => ($menuCollapsed === true) ? 'display:block' : 'display:none',
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index d101d8f3eb..e79f8cb55a 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -273,7 +273,7 @@ function menu_print_menu(&$menu)
$submenu_output .= '';
if (isset($sub['subtype']) && $sub['subtype'] == 'nolink') {
- $submenu_output .= ''.$sub['text'].'
';
+ $submenu_output .= '';
} else if (isset($sub['subtype']) && $sub['subtype'] == 'new_blank') {
$submenu_output .= ''.$sub['text'].'
';
} else {
@@ -434,7 +434,11 @@ function menu_print_menu(&$menu)
if ($menuTypeClass === 'collapsed') {
$div = ''.$main['text'].'';
} else {
- $div = ''.$main['text'].'';
+ if ($id === 'about') {
+ $div = ''.$main['text'].'';
+ } else {
+ $div = ''.$main['text'].'';
+ }
}
$output .= sprintf('', $div);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 0a665c5f23..6a658997f6 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1838,8 +1838,7 @@ function ui_process_page_head($string, $bitfield)
$config['css'] = array_merge(
[
'common' => 'include/styles/common.css',
- // 'menu' => 'include/styles/menu.css',
- 'menu' => 'include/styles/menu2.css',
+ 'menu' => 'include/styles/menu.css',
'tables' => 'include/styles/tables.css',
'general' => 'include/styles/pandora.css',
],
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index d59f802498..08bfd09d94 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -15,6 +15,66 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#div_display {
+ height: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+#div_display::-webkit-scrollbar {
+ -webkit-appearance: none;
+}
+
+#div_display::-webkit-scrollbar:vertical {
+ width: 5px;
+}
+
+#div_display::-webkit-scrollbar-button:increment,
+#div_display::-webkit-scrollbar-button {
+ display: none;
+}
+
+#div_display::-webkit-scrollbar-thumb {
+ background-color: #6c7587;
+ border-radius: 2.5px;
+ opacity: 0.5;
+ height: 50px;
+}
+
+#div_display::-webkit-scrollbar-track {
+ border-radius: 10px;
+}
+
+#div_management {
+ display: none;
+ height: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+#div_management::-webkit-scrollbar {
+ -webkit-appearance: none;
+}
+
+#div_management::-webkit-scrollbar:vertical {
+ width: 5px;
+}
+
+#div_management::-webkit-scrollbar-button:increment,
+#div_management::-webkit-scrollbar-button {
+ display: none;
+}
+
+#div_management::-webkit-scrollbar-thumb {
+ background-color: #6c7587;
+ border-radius: 2.5px;
+ opacity: 0.5;
+ height: 50px;
+}
+
+#div_management::-webkit-scrollbar-track {
+ border-radius: 10px;
+}
.operation li,
.godmode li {
@@ -30,8 +90,12 @@
.operation .menu_icon ul.submenu > li,
.godmode .menu_icon ul.submenu > li {
- background-color: #282828;
- padding-left: 1.5em;
+ background-color: #ffffff;
+ padding-left: 24px !important;
+}
+
+.menu {
+ height: 100%;
}
.menu ul {
@@ -39,54 +103,61 @@
padding: 0;
margin: 0;
}
+
.menu li.selected,
.menu li.not_selected {
margin: 0;
}
.menu li a {
- color: #ffffff;
text-decoration: none;
width: 100%;
}
.menu_full li:hover ul {
display: block;
+ background-color: red;
}
.submenu_text {
margin-left: 0px;
width: 100%;
- color: #b9b9b9;
font-size: 9.4pt;
+ user-select: none;
}
.menu a:hover {
text-decoration: none;
border: 0px;
}
+
.submenu {
margin: 0px 0px 0px 0px;
- position: absolute;
- z-index: 999;
- width: 240px;
+ /* position: absolute; */
+ width: 260px;
+ margin-left: 20px !important;
}
.submenu2 {
- position: absolute;
+ /* position: absolute; */
z-index: 999;
- left: 240px;
- width: 240px;
+ width: 238px;
}
.sub_subMenu {
font-weight: normal;
- background-color: #202020;
+ background-color: #f0f3f3;
padding-left: 1.5em;
+ color: #161628 !important;
}
.sub_subMenu.selected {
font-weight: 600;
+ background-color: #002f33 !important;
+}
+
+.sub_subMenu.selected a {
+ color: #fff !important;
}
.submenu2 li a {
@@ -102,8 +173,19 @@
}
.menu li.has_submenu {
- background: url(../../images/arrow.png) no-repeat 95% 50%;
- z-index: 1; /* Positions it on top of the rest */
+ display: flex;
+ flex-direction: column;
+ z-index: 1;
+}
+
+.has_submenu {
+ color: #161628 !important;
+}
+
+.span_has_menu_text {
+ font-weight: normal;
+ font-size: 9.4pt;
+ color: #3f3f3f;
}
.menu li.submenu_not_selected a,
@@ -113,19 +195,26 @@
.submenu_selected {
margin-bottom: 0px;
- box-shadow: inset 4px 0 #82b92e;
-}
-.selected.submenu_selected {
- background-color: #202020;
+ background-color: #eff2f2 !important;
}
-li.submenu_selected.selected {
- background-color: #202020;
- font-weight: 600;
+.submenu_selected_no_submenu {
+ background-color: #eff2f2 !important;
+ background-color: #002f33 !important;
+ color: #ffffff !important;
}
-li.sub_subMenu.selected {
- background-color: #161616;
+.element_submenu_selected {
+ min-height: 0px !important;
+ height: 20px;
+ border-left: 4px solid #82b92e;
+ position: absolute;
+ left: 4%;
+ border-radius: 5px;
+}
+
+.left_3 {
+ left: 3%;
}
.menu .menu_icon,
@@ -139,81 +228,107 @@ li.sub_subMenu.selected {
background-position: 4px 8px;
}
+.flex_li {
+ display: flex;
+ flex-direction: column;
+}
+
/* Icons specified here */
-#icon_oper-networkconsole {
- background-image: url(../../images/menu/op_network.menu_gray.png);
+.icon_oper-networkconsole {
+ background: url(../../images/menu/op_network.menu_gray.png) no-repeat 50% 50%;
}
-#icon_oper-agents {
- background-image: url(../../images/menu/op_monitoring.menu_gray.png);
+
+.icon_oper-agents {
+ background: url(../../images/menu/op_monitoring.menu_gray.png) no-repeat 50%
+ 50%;
}
-#icon_oper-events {
- background-image: url(../../images/menu/op_events.menu_gray.png);
+
+.icon_oper-events {
+ background: url(../../images/menu/op_events.menu_gray.png) no-repeat 50% 50%;
}
/* users */
-#icon_oper-users {
- background-image: url(../../images/menu/op_workspace.menu_gray.png);
+.icon_oper-users {
+ background: url(../../images/menu/op_workspace.menu_gray.png) no-repeat 50%
+ 50%;
}
+
/* trap console */
-#icon_oper-snmpc,
-#icon_god-snmpc {
- background-image: url(../../images/menu/op_snmp.menu.png);
+.icon_oper-snmpc,
+.icon_god-snmpc {
+ background: url(../../images/menu/op_snmp.menu.png) no-repeat 50% 50%;
}
-#icon_oper-reporting {
- background-image: url(../../images/menu/op_reporting.menu_gray.png);
+
+.icon_oper-reporting {
+ background: url(../../images/menu/op_reporting.menu_gray.png) no-repeat 50%
+ 50%;
}
-#icon_oper-gismaps {
- background-image: url(../../images/menu/op_gis.menu.png);
+
+.icon_oper-gismaps {
+ background: url(../../images/menu/op_gis.menu.png) no-repeat 50% 50%;
}
-#icon_oper-netflow {
- background-image: url(../../images/menu/op_netflow.menu.png);
+
+.icon_oper-netflow {
+ background: url(../../images/menu/op_netflow.menu.png) no-repeat 50% 50%;
}
-#icon_oper-extensions {
- background-image: url(../../images/menu/extensions.menu_gray.png);
+
+.icon_oper-extensions {
+ background: url(../../images/menu/extensions.menu_gray.png) no-repeat 50% 50%;
}
/* Godmode images */
-#icon_god-discovery {
- background-image: url(../../images/menu/gm_discovery.menu.png);
+.icon_god-discovery {
+ background: url(../../images/menu/gm_discovery.menu.png) no-repeat 50% 50%;
}
-#icon_god-resources {
- background-image: url(../../images/menu/gm_resources.menu_gray.png);
+
+.icon_god-resources {
+ background: url(../../images/menu/gm_resources.menu_gray.png) no-repeat 50%
+ 50%;
}
-#icon_god-configuration {
- background-image: url(../../images/menu/gm_configuration.menu_gray.png);
+
+.icon_god-configuration {
+ background: url(../../images/menu/gm_configuration.menu_gray.png) no-repeat
+ 50% 50%;
}
-#icon_god-alerts {
- background-image: url(../../images/menu/gm_alerts.menu_gray.png);
+
+.icon_god-alerts {
+ background: url(../../images/menu/gm_alerts.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-users {
- background-image: url(../../images/menu/gm_users.menu_gray.png);
+
+.icon_god-users {
+ background: url(../../images/menu/gm_users.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-reporting {
- background-image: url(../../images/menu/reporting_edit.menu.png);
+
+.icon_god-reporting {
+ background: url(../../images/menu/reporting_edit.menu.png) no-repeat 50% 50%;
}
-#icon_god-servers {
- background-image: url(../../images/menu/gm_servers.menu_gray.png);
+
+.icon_god-servers {
+ background: url(../../images/menu/gm_servers.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-setup {
- background-image: url(../../images/menu/gm_setup.menu_gray.png);
+
+.icon_god-setup {
+ background: url(../../images/menu/gm_setup.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-events {
- background-image: url(../../images/menu/gm_events.menu_gray.png);
+
+.icon_god-events {
+ background: url(../../images/menu/gm_events.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-extensions {
- background-image: url(../../images/menu/builder.menu_gray.png);
+
+.icon_god-extensions {
+ background: url(../../images/menu/builder.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-links {
- background-image: url(../../images/menu/links.menu_gray.png);
+
+.icon_god-links {
+ background: url(../../images/menu/links.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-um_messages {
- background-image: url(../../images/menu/um_messages.menu_gray.png);
+
+.icon_god-um_messages {
+ background: url(../../images/menu/um_messages.menu_gray.png) no-repeat 50% 50%;
}
-#icon_god-module_library {
- background-image: url(../../images/menu/gm_library.menu_gray.png);
-}
-#icon_about {
- background-image: url(../../images/menu/about.menu_gray.png);
+
+.icon_god-module_library {
+ background: url(../../images/menu/gm_library.menu_gray.png) no-repeat 50% 50%;
}
#menu_container {
@@ -248,8 +363,8 @@ ul li {
}
.menu li ul {
- position: absolute;
- top: 0;
+ /* position: absolute; */
+ /* top: 0; */
display: none;
}
@@ -258,9 +373,11 @@ ul li {
float: left;
height: 1%;
}
+
* html ul li a {
height: 1%;
}
+
/* End */
/*
@@ -270,36 +387,28 @@ ul li {
*/
.menu_icon:hover {
- background-color: #282828;
+ background-color: #f6f7fb;
}
+
.submenu_not_selected:hover {
- background-color: #202020;
-}
-.submenu_selected:hover {
- background-color: #202020;
+ background-color: #eff2f2 !important;
}
+
.sub_subMenu:hover {
- background-color: #161616;
+ background-color: #d9e0e1;
}
.menu li.selected {
- box-shadow: inset 4px 0 #82b92e;
+ /* box-shadow: inset 4px 0 #82b92e; */
}
.operation {
- background-color: #3d3d3d;
padding-top: 20px;
}
.operation .selected,
.godmode .selected {
- background-color: #282828;
-}
-
-.operation .selected #title_menu,
-.godmode .selected #title_menu {
- color: #fff;
- font-weight: 600;
+ background-color: #f6f7fb;
}
.menu > .operation {
@@ -315,71 +424,92 @@ ul li {
}
.menu li div {
- background-clip: text; /* Very important to fix a bug in Firefox */
+ background-clip: text;
+ /* Very important to fix a bug in Firefox */
}
.godmode {
- padding-bottom: 4px;
- background-color: #343434;
+ padding-top: 2em !important;
}
/* Menu icons active */
-.selected#icon_oper-networkconsole {
- background-image: url(../../images/menu/op_network.menu_white.png);
+.selected.icon_oper-networkconsole {
+ background: url(../../images/menu/op_network.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_oper-agents {
- background-image: url(../../images/menu/op_monitoring.menu_white.png);
+
+.selected.icon_oper-agents {
+ background: url(../../images/menu/op_monitoring.menu_white.png) no-repeat 50%
+ 50%;
}
-.selected#icon_oper-events {
- background-image: url(../../images/menu/op_events.menu_white.png);
+
+.selected.icon_oper-events {
+ background: url(../../images/menu/op_events.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_oper-users {
- background-image: url(../../images/menu/op_workspace.menu_white.png);
+
+.selected.icon_oper-users {
+ background: url(../../images/menu/op_workspace.menu_white.png) no-repeat 50%
+ 50%;
}
-.selected#icon_oper-reporting {
- background-image: url(../../images/menu/op_reporting.menu_white.png);
+
+.selected.icon_oper-reporting {
+ background: url(../../images/menu/op_reporting.menu_white.png) no-repeat 50%
+ 50%;
}
-.selected#icon_oper-extensions {
- background-image: url(../../images/menu/extensions.menu_white.png);
+
+.selected.icon_oper-extensions {
+ background: url(../../images/menu/extensions.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-discovery {
- background-image: url(../../images/menu/gm_discovery.menu_white.png);
+
+.selected.icon_god-discovery {
+ background: url(../../images/menu/gm_discovery.menu_white.png) no-repeat 50%
+ 50%;
}
-.selected#icon_god-resources {
- background-image: url(../../images/menu/gm_resources.menu_white.png);
+
+.selected.icon_god-resources {
+ background: url(../../images/menu/gm_resources.menu_white.png) no-repeat 50%
+ 50%;
}
-.selected#icon_god-configuration {
- background-image: url(../../images/menu/gm_configuration.menu_white.png);
+
+.selected.icon_god-configuration {
+ background: url(../../images/menu/gm_configuration.menu_white.png) no-repeat
+ 50% 50%;
}
-.selected#icon_god-alerts {
- background-image: url(../../images/menu/gm_alerts.menu_white.png);
+
+.selected.icon_god-alerts {
+ background: url(../../images/menu/gm_alerts.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-users {
- background-image: url(../../images/menu/gm_users.menu_white.png);
+
+.selected.icon_god-users {
+ background: url(../../images/menu/gm_users.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-servers {
- background-image: url(../../images/menu/gm_servers.menu_white.png);
+
+.selected.icon_god-servers {
+ background: url(../../images/menu/gm_servers.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-setup {
- background-image: url(../../images/menu/gm_setup.menu_white.png);
+
+.selected.icon_god-setup {
+ background: url(../../images/menu/gm_setup.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-events {
- background-image: url(../../images/menu/gm_events.menu_white.png);
+
+.selected.icon_god-events {
+ background: url(../../images/menu/gm_events.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-extensions {
- background-image: url(../../images/menu/builder.menu_white.png);
+
+.selected.icon_god-extensions {
+ background: url(../../images/menu/builder.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-links {
- background-image: url(../../images/menu/links.menu_white.png);
+
+.selected.icon_god-links {
+ background: url(../../images/menu/links.menu_white.png) no-repeat 50% 50%;
}
-.selected#icon_god-um_messages {
- background-image: url(../../images/menu/um_messages.menu_white.png);
+
+.selected.icon_god-um_messages {
+ background: url(../../images/menu/um_messages.menu_white.png) no-repeat 50%
+ 50%;
}
-.selected#icon_god-module_library {
- background-image: url(../../images/menu/gm_library.menu_white.png);
-}
-.selected#icon_about {
- background-image: url(../../images/menu/about.menu_white.png);
+
+.selected.icon_god-module_library {
+ background: url(../../images/menu/gm_library.menu_white.png) no-repeat 50% 50%;
}
#menu_full {
@@ -390,7 +520,7 @@ ul li {
z-index: 1;
top: 0;
left: 0;
- background-color: #343434;
+ background-color: #ffffff;
}
.button_collapse {
@@ -408,41 +538,46 @@ ul li {
background-color: #fff;
min-height: 60px;
display: flex;
- justify-content: center;
+ justify-content: space-around;
align-items: center;
}
.menu_full_classic,
.button_classic {
- width: 215px;
+ width: 280px;
}
.menu_full_collapsed,
.button_collapsed {
- width: 60px;
+ width: 80px;
}
.menu_full_classic .title_menu_classic {
display: flex !important;
}
+
.menu_icon_collapsed {
background-position: 50% 50%;
}
.menu_full_collapsed .title_menu_collapsed {
- display: none !important;
+ display: flex !important;
}
.button_classic {
- background-image: url(../../images/button_collapse_menu.png);
+ background-image: url(../../images/menu/contraer.svg);
background-repeat: no-repeat;
background-position: center;
+ height: 35px;
+ width: 35px;
}
.button_collapsed {
- background-image: url(../../images/button_classic_menu.png);
+ background-image: url(../../images/menu/expandir.svg);
background-repeat: no-repeat;
background-position: center;
+ height: 35px;
+ width: 35px;
}
/* Menu height: 601px, 720px, 735px */
@@ -458,6 +593,7 @@ ul li {
.operation {
padding-top: 10px;
}
+
.button_collapse {
margin-top: 10px;
}
@@ -469,17 +605,139 @@ ul li {
* ---------------------------------------------------------------------
*/
.page_classic {
- padding-left: 215px;
+ padding-left: 280px;
}
.page_collapsed {
- padding-left: 60px;
+ padding-left: 80px;
}
.header_table_classic {
- padding-left: 235px; /* 215 + 35 */
+ padding-left: 315px;
+ /* 280 + 35 */
}
.header_table_collapsed {
- padding-left: 80px; /* 60 + 35 */
+ padding-left: 115px;
+ /* 80 + 35 */
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * - TABS styles -
+ * ---------------------------------------------------------------------
+ */
+
+#menu_tabs {
+ height: 53px;
+ border-bottom: 1px solid #c1ccdc;
+ padding-bottom: 2px;
+}
+
+.div_border_line {
+ height: 3px;
+ width: 100%;
+ display: flex;
+ justify-content: space-around;
+}
+
+.border_line {
+ width: 100px;
+ height: 100%;
+}
+
+.tabs_ul {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+ min-height: 53px;
+}
+
+.tabs_li {
+ width: 100%;
+ height: 100%;
+ cursor: pointer;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.tabs_li span {
+ color: #161628;
+ font-size: 14px;
+ font-weight: 400;
+ user-select: none;
+}
+
+.tabs_selected {
+ background-color: #82b92e;
+}
+
+.arrow_menu_down {
+ background: url(../../images/menu/arrow_down_grey.svg) no-repeat 75% 50%;
+ z-index: 1;
+}
+
+.arrow_menu_up {
+ background: url(../../images/menu/arrow_up_grey.svg) no-repeat 75% 50%;
+ z-index: 1;
+}
+
+.span_selected {
+ color: #1d7874 !important;
+ font-weight: bold;
+}
+
+.tabs_collapsed {
+ height: 48px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.tabs_collapsed_container {
+ background-color: #002f33;
+ border-radius: 16px;
+ width: 60px;
+ height: 32px;
+ display: flex;
+ justify-content: space-evenly;
+ align-items: center;
+}
+
+.tabs_collapsed_div {
+ height: 21px;
+ width: 21px;
+ cursor: pointer;
+}
+
+.tabs_collapsed_display {
+ background-image: url(../../images/menu/display.svg);
+ background-repeat: no-repeat;
+ background-position: center;
+ width: 21px;
+ height: 21px;
+}
+
+.tabs_collapsed_management {
+ background-image: url(../../images/menu/management.svg);
+ background-repeat: no-repeat;
+ background-position: center;
+ width: 21px;
+ height: 21px;
+}
+
+.tabs_collapsed_oval {
+ background-color: #ffffff;
+ border-radius: 100%;
+ opacity: 0.33;
+ width: 8px;
+ height: 8px;
+ cursor: pointer;
+ margin: 6px;
+}
+
+.logo_icon {
+ margin-left: 16px;
}
diff --git a/pandora_console/include/styles/menu2.css b/pandora_console/include/styles/menu2.css
deleted file mode 100644
index a7236526ca..0000000000
--- a/pandora_console/include/styles/menu2.css
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2004-2021 Artica Soluciones Tecnológicas S.L
-
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#div_display {
- height: 100%;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-#div_display::-webkit-scrollbar {
- -webkit-appearance: none;
-}
-
-#div_display::-webkit-scrollbar:vertical {
- width: 5px;
-}
-
-#div_display::-webkit-scrollbar-button:increment,
-#div_display::-webkit-scrollbar-button {
- display: none;
-}
-
-#div_display::-webkit-scrollbar-thumb {
- background-color: #6c7587;
- border-radius: 2.5px;
- opacity: 0.5;
- height: 50px;
-}
-
-#div_display::-webkit-scrollbar-track {
- border-radius: 10px;
-}
-
-#div_management {
- display: none;
- height: 100%;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-#div_management::-webkit-scrollbar {
- -webkit-appearance: none;
-}
-
-#div_management::-webkit-scrollbar:vertical {
- width: 5px;
-}
-
-#div_management::-webkit-scrollbar-button:increment,
-#div_management::-webkit-scrollbar-button {
- display: none;
-}
-
-#div_management::-webkit-scrollbar-thumb {
- background-color: #6c7587;
- border-radius: 2.5px;
- opacity: 0.5;
- height: 50px;
-}
-
-#div_management::-webkit-scrollbar-track {
- border-radius: 10px;
-}
-
-.operation li,
-.godmode li {
- display: flex;
- justify-content: flex-start;
- align-items: center;
-}
-
-.operation > li.menu_icon.no_hidden_menu,
-.godmode > li.menu_icon.no_hidden_menu {
- justify-content: flex-end;
-}
-
-.operation .menu_icon ul.submenu > li,
-.godmode .menu_icon ul.submenu > li {
- background-color: #ffffff;
- padding-left: 24px !important;
-}
-
-.menu {
- height: 100%;
-}
-
-.menu ul {
- list-style-type: none;
- padding: 0;
- margin: 0;
-}
-
-.menu li.selected,
-.menu li.not_selected {
- margin: 0;
-}
-
-.menu li a {
- text-decoration: none;
- width: 100%;
-}
-
-.menu_full li:hover ul {
- display: block;
- background-color: red;
-}
-
-.submenu_text {
- margin-left: 0px;
- width: 100%;
- font-size: 9.4pt;
- user-select: none;
-}
-
-.menu a:hover {
- text-decoration: none;
- border: 0px;
-}
-
-.submenu {
- margin: 0px 0px 0px 0px;
- /* position: absolute; */
- width: 260px;
- margin-left: 20px !important;
-}
-
-.submenu2 {
- /* position: absolute; */
- z-index: 999;
- width: 238px;
-}
-
-.sub_subMenu {
- font-weight: normal;
- background-color: #f0f3f3;
- padding-left: 1.5em;
- color: #161628 !important;
-}
-
-.sub_subMenu.selected {
- font-weight: 600;
- background-color: #002f33 !important;
-}
-
-.sub_subMenu.selected a {
- color: #fff !important;
-}
-
-.submenu2 li a {
- margin-left: 0px;
- padding-left: 0px;
-}
-
-.menu li img.toggle {
- visibility: hidden;
- float: right;
- /* Positions it back where it should be */
- border-left: 1px;
-}
-
-.menu li.has_submenu {
- display: flex;
- flex-direction: column;
- z-index: 1;
-}
-
-.has_submenu {
- color: #161628 !important;
-}
-
-.menu li.submenu_not_selected a,
-.menu li.submenu2_not_selected a {
- font-weight: normal;
-}
-
-.submenu_selected {
- margin-bottom: 0px;
- background-color: #eff2f2 !important;
-}
-
-.submenu_selected_no_submenu {
- background-color: #eff2f2 !important;
- background-color: #002f33 !important;
- color: #ffffff !important;
-}
-
-.element_submenu_selected {
- min-height: 0px !important;
- height: 20px;
- border-left: 4px solid #82b92e;
- position: absolute;
- left: 4%;
- border-radius: 5px;
-}
-
-.left_3 {
- left: 3%;
-}
-
-.menu .menu_icon,
-.menu li.links {
- background-repeat: no-repeat;
- cursor: pointer;
-}
-
-.menu li.links {
- background-image: url(../../images/link.png);
- background-position: 4px 8px;
-}
-
-.flex_li {
- display: flex;
- flex-direction: column;
-}
-
-/* Icons specified here */
-.icon_oper-networkconsole {
- background: url(../../images/menu/op_network.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_oper-agents {
- background: url(../../images/menu/op_monitoring.menu_gray.png) no-repeat 50%
- 50%;
-}
-
-.icon_oper-events {
- background: url(../../images/menu/op_events.menu_gray.png) no-repeat 50% 50%;
-}
-
-/* users */
-.icon_oper-users {
- background: url(../../images/menu/op_workspace.menu_gray.png) no-repeat 50%
- 50%;
-}
-
-/* trap console */
-.icon_oper-snmpc,
-.icon_god-snmpc {
- background: url(../../images/menu/op_snmp.menu.png) no-repeat 50% 50%;
-}
-
-.icon_oper-reporting {
- background: url(../../images/menu/op_reporting.menu_gray.png) no-repeat 50%
- 50%;
-}
-
-.icon_oper-gismaps {
- background: url(../../images/menu/op_gis.menu.png) no-repeat 50% 50%;
-}
-
-.icon_oper-netflow {
- background: url(../../images/menu/op_netflow.menu.png) no-repeat 50% 50%;
-}
-
-.icon_oper-extensions {
- background: url(../../images/menu/extensions.menu_gray.png) no-repeat 50% 50%;
-}
-
-/* Godmode images */
-.icon_god-discovery {
- background: url(../../images/menu/gm_discovery.menu.png) no-repeat 50% 50%;
-}
-
-.icon_god-resources {
- background: url(../../images/menu/gm_resources.menu_gray.png) no-repeat 50%
- 50%;
-}
-
-.icon_god-configuration {
- background: url(../../images/menu/gm_configuration.menu_gray.png) no-repeat
- 50% 50%;
-}
-
-.icon_god-alerts {
- background: url(../../images/menu/gm_alerts.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-users {
- background: url(../../images/menu/gm_users.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-reporting {
- background: url(../../images/menu/reporting_edit.menu.png) no-repeat 50% 50%;
-}
-
-.icon_god-servers {
- background: url(../../images/menu/gm_servers.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-setup {
- background: url(../../images/menu/gm_setup.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-events {
- background: url(../../images/menu/gm_events.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-extensions {
- background: url(../../images/menu/builder.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-links {
- background: url(../../images/menu/links.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-um_messages {
- background: url(../../images/menu/um_messages.menu_gray.png) no-repeat 50% 50%;
-}
-
-.icon_god-module_library {
- background: url(../../images/menu/gm_library.menu_gray.png) no-repeat 50% 50%;
-}
-
-#menu_container {
- z-index: 3;
- position: absolute;
- left: -80px;
-}
-
-.notification_ball {
- margin-top: 2px;
- margin-left: 29px;
- font-size: 6pt;
- font-weight: 900;
- background: red;
- height: 12px;
- width: 12px;
- border-radius: 50px;
- position: absolute;
- text-align: center;
- color: white;
- padding-top: 1px;
-}
-
-ul {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-ul li {
- position: relative;
-}
-
-.menu li ul {
- /* position: absolute; */
- /* top: 0; */
- display: none;
-}
-
-/* Fix IE. Hide from IE Mac \*/
-* html ul li {
- float: left;
- height: 1%;
-}
-
-* html ul li a {
- height: 1%;
-}
-
-/* End */
-
-/*
- * ---------------------------------------------------------------------
- * - MAIN LEFT MENU and SUBMENU -
- * ---------------------------------------------------------------------
- */
-
-.menu_icon:hover {
- background-color: #f6f7fb;
-}
-
-.submenu_not_selected:hover {
- background-color: #eff2f2 !important;
-}
-
-.sub_subMenu:hover {
- background-color: #d9e0e1;
-}
-
-.menu li.selected {
- /* box-shadow: inset 4px 0 #82b92e; */
-}
-
-.operation {
- padding-top: 20px;
-}
-
-.operation .selected,
-.godmode .selected {
- background-color: #f6f7fb;
-}
-
-.menu > .operation {
- padding-top: 2em;
-}
-
-.menu li,
-.menu li a,
-.menu li div {
- min-height: 35px;
- display: flex;
- align-items: center;
-}
-
-.menu li div {
- background-clip: text;
- /* Very important to fix a bug in Firefox */
-}
-
-.godmode {
- padding-top: 2em !important;
-}
-
-/* Menu icons active */
-.selected.icon_oper-networkconsole {
- background: url(../../images/menu/op_network.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_oper-agents {
- background: url(../../images/menu/op_monitoring.menu_white.png) no-repeat 50%
- 50%;
-}
-
-.selected.icon_oper-events {
- background: url(../../images/menu/op_events.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_oper-users {
- background: url(../../images/menu/op_workspace.menu_white.png) no-repeat 50%
- 50%;
-}
-
-.selected.icon_oper-reporting {
- background: url(../../images/menu/op_reporting.menu_white.png) no-repeat 50%
- 50%;
-}
-
-.selected.icon_oper-extensions {
- background: url(../../images/menu/extensions.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-discovery {
- background: url(../../images/menu/gm_discovery.menu_white.png) no-repeat 50%
- 50%;
-}
-
-.selected.icon_god-resources {
- background: url(../../images/menu/gm_resources.menu_white.png) no-repeat 50%
- 50%;
-}
-
-.selected.icon_god-configuration {
- background: url(../../images/menu/gm_configuration.menu_white.png) no-repeat
- 50% 50%;
-}
-
-.selected.icon_god-alerts {
- background: url(../../images/menu/gm_alerts.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-users {
- background: url(../../images/menu/gm_users.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-servers {
- background: url(../../images/menu/gm_servers.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-setup {
- background: url(../../images/menu/gm_setup.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-events {
- background: url(../../images/menu/gm_events.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-extensions {
- background: url(../../images/menu/builder.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-links {
- background: url(../../images/menu/links.menu_white.png) no-repeat 50% 50%;
-}
-
-.selected.icon_god-um_messages {
- background: url(../../images/menu/um_messages.menu_white.png) no-repeat 50%
- 50%;
-}
-
-.selected.icon_god-module_library {
- background: url(../../images/menu/gm_library.menu_white.png) no-repeat 50% 50%;
-}
-
-#menu_full {
- height: 100%;
- display: flex;
- flex-direction: column;
- position: fixed;
- z-index: 1;
- top: 0;
- left: 0;
- background-color: #ffffff;
-}
-
-.button_collapse {
- margin-top: auto;
- min-height: 38px;
- background-color: #505050;
- text-align: center;
- color: #fff;
- cursor: pointer;
- background-repeat: no-repeat;
- background-position: center;
-}
-
-.logo_green {
- background-color: #fff;
- min-height: 60px;
- display: flex;
- justify-content: space-around;
- align-items: center;
-}
-
-.menu_full_classic,
-.button_classic {
- width: 280px;
-}
-
-.menu_full_collapsed,
-.button_collapsed {
- width: 80px;
-}
-
-.menu_full_classic .title_menu_classic {
- display: flex !important;
-}
-
-.menu_icon_collapsed {
- background-position: 50% 50%;
-}
-
-.menu_full_collapsed .title_menu_collapsed {
- display: flex !important;
-}
-
-.button_classic {
- background-image: url(../../images/menu/contraer.svg);
- background-repeat: no-repeat;
- background-position: center;
- height: 35px;
- width: 35px;
-}
-
-.button_collapsed {
- background-image: url(../../images/menu/contraer.svg);
- background-repeat: no-repeat;
- background-position: center;
- height: 35px;
- width: 35px;
- -webkit-transform: rotate(-180deg);
- -moz-transform: rotate(-180deg);
- -ms-transform: rotate(-180deg);
- transform: rotate(-180deg);
-}
-
-/* Menu height: 601px, 720px, 735px */
-@media screen and (max-height: 750px) {
- .menu li,
- .menu li a,
- .menu li div {
- min-height: 28px;
- }
-}
-
-@media screen and (max-height: 750px) {
- .operation {
- padding-top: 10px;
- }
-
- .button_collapse {
- margin-top: 10px;
- }
-}
-
-/*
- * ---------------------------------------------------------------------
- * - STYLES TO CHANGE CLASSIC MENU AND COLLAPSED MENU -
- * ---------------------------------------------------------------------
- */
-.page_classic {
- padding-left: 280px;
-}
-
-.page_collapsed {
- padding-left: 80px;
-}
-
-.header_table_classic {
- padding-left: 315px;
- /* 280 + 35 */
-}
-
-.header_table_collapsed {
- padding-left: 115px;
- /* 80 + 35 */
-}
-
-/*
- * ---------------------------------------------------------------------
- * - TABS styles -
- * ---------------------------------------------------------------------
- */
-
-#menu_tabs {
- height: 53px;
- border-bottom: 1px solid #c1ccdc;
- padding-bottom: 2px;
-}
-
-.div_border_line {
- height: 3px;
- width: 100%;
- display: flex;
- justify-content: space-around;
-}
-
-.border_line {
- width: 100px;
- height: 100%;
-}
-
-.tabs_ul {
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: space-evenly;
- min-height: 53px;
-}
-
-.tabs_li {
- width: 100%;
- height: 100%;
- cursor: pointer;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.tabs_li span {
- color: #161628;
- font-size: 14px;
- font-weight: 400;
-}
-
-.tabs_selected {
- background-color: #82b92e;
-}
-
-.arrow_menu_down {
- background: url(../../images/menu/arrow_down_grey.svg) no-repeat 75% 50%;
- z-index: 1;
-}
-
-.arrow_menu_up {
- background: url(../../images/menu/arrow_up_grey.svg) no-repeat 75% 50%;
- z-index: 1;
-}
-
-.span_selected {
- color: #1d7874 !important;
- font-weight: bold;
-}
-
-.tabs_collapsed {
- height: 48px;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.tabs_collapsed_container {
- background-color: #002f33;
- border-radius: 16px;
- width: 60px;
- height: 32px;
- display: flex;
- justify-content: space-evenly;
- align-items: center;
-}
-
-.tabs_collapsed_display {
- background-image: url(../../images/eye.png);
- background-repeat: no-repeat;
- background-position: center;
- width: 21px;
- height: 21px;
-}
-
-.tabs_collapsed_management {
- background-image: url(../../images/cog.png);
- background-repeat: no-repeat;
- background-position: center;
- width: 21px;
- height: 21px;
-}
-
-.tabs_collapsed_oval {
- background-color: #ffffff;
- border-radius: 100%;
- opacity: 0.33;
- width: 8px;
- height: 8px;
- cursor: pointer;
- margin: 6px;
-}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index e82e675d0e..1826dbe789 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1169,8 +1169,7 @@ if ($config['pure'] == 0) {
echo sprintf('', $menuTypeClass);
echo '';
echo '';
} else {