tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Pablo Aragon 2023-03-29 17:09:49 +02:00
parent f26e70630a ee0619cc4a
commit e067a176a4
3 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/class/CustomNetScan.class.php
View File

@ -523,11 +523,13 @@ class CustomNetScan extends Wizard
// Schedule.
$form['inputs'][] = [
'label' => __('Interval').ui_print_help_tip(
'label' => __('Interval').ui_print_help_tip(
__('Manual interval means that it will be executed only On-demand'),
true
),
'arguments' => [
'class' => 'input-interval',
'extra-container' => true,
'arguments' => [
'type' => 'select',
'selected' => $interv_manual,
'fields' => [
@ -537,7 +539,7 @@ class CustomNetScan extends Wizard
'name' => 'interval_manual_defined',
'return' => true,
],
'extra' => '<span id="interval_manual_container">'.html_print_extended_select_for_time(
'extra' => '<span id="interval_manual_container">'.html_print_extended_select_for_time(
'interval',
$this->task['interval_sweep'],
'',

12
pandora_console/include/javascript/tree/TreeController.js
View File

@ -655,7 +655,7 @@ var TreeController = {
$content.append(
'<div class="node-icon"><div class="node-icon-container"><img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
(controller.meta != undefined && controller.meta == 1
(controller.baseURL.indexOf("meta") !== -1
? "../../images/"
: "images/") +
element.icon +
@ -1078,7 +1078,10 @@ var TreeController = {
(controller.baseURL.length > 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")

31
pandora_console/include/lib/Dashboard/Widgets/tree_view.php
View File

@ -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',