From 8c3b5d650debec3919701bede6de36a068c4fcf0 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 29 Mar 2023 16:50:17 +0200 Subject: [PATCH] tree view dashboard metaconsole --- .../include/javascript/tree/TreeController.js | 12 +++++-- .../lib/Dashboard/Widgets/tree_view.php | 31 +++++-------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 368ebd69a9..841e48dbe1 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -655,7 +655,7 @@ var TreeController = { $content.append( '
0 ? controller.baseURL : "") + - 'images/module-graph.svg" /> ' + (controller.baseURL.indexOf("meta") !== -1 + ? "../../images/" + : "images/") + + 'module-graph.svg" /> ' ); } @@ -1123,7 +1126,10 @@ var TreeController = { (controller.baseURL.length > 0 ? controller.baseURL : "") + - 'images/simple-value.svg" /> ' + (controller.baseURL.indexOf("meta") !== -1 + ? "../../images/" + : "images/") + + 'simple-value.svg" /> ' ); $dataImage .addClass("module-data") diff --git a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php index e832f1293f..a351f8b156 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php +++ b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php @@ -134,12 +134,7 @@ class TreeViewWidget extends Widget ) { global $config; - if (is_metaconsole() === true) { - ui_require_css_file('tree_meta'); - } else { - ui_require_css_file('tree'); - } - + ui_require_css_file('tree'); ui_require_css_file('fixed-bottom-box'); // WARNING: Do not edit. This chunk must be in the constructor. @@ -559,11 +554,7 @@ class TreeViewWidget extends Widget $height = $size['height']; // Css Files. - if (is_metaconsole() === true) { - \ui_require_css_file('tree_meta', 'include/styles/', true); - } else { - \ui_require_css_file('tree', 'include/styles/', true); - } + \ui_require_css_file('tree', 'include/styles/', true); if ($config['style'] == 'pandora_black' && !is_metaconsole()) { \ui_require_css_file('pandora_black', 'include/styles/', true); @@ -576,19 +567,11 @@ class TreeViewWidget extends Widget 'include/javascript/i18n/' ); - if (is_metaconsole() === true) { - \ui_require_javascript_file( - 'TreeControllerMeta', - 'include/javascript/tree/', - true - ); - } else { - \ui_require_javascript_file( - 'TreeController', - 'include/javascript/tree/', - true - ); - } + \ui_require_javascript_file( + 'TreeController', + 'include/javascript/tree/', + true + ); \ui_require_javascript_file( 'fixed-bottom-box',