From 5f3cbbb12af81d0d5b71b2fc4087dc79f6dd7063 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 4 May 2023 11:14:11 +0200 Subject: [PATCH 1/3] fixed visual errors in legacy VC pandora_enterprise#11054 --- .../reporting/visual_console_builder.data.php | 1 - .../visual_console_builder.editor.js | 49 ++--- .../visual_console_builder.editor.php | 6 +- .../ajax/visual_console_builder.ajax.php | 4 +- .../include/functions_visual_map.php | 13 +- .../include/functions_visual_map_editor.php | 206 +++++++++++------- .../lib/Dashboard/Widgets/BasicChart.php | 1 - pandora_console/include/styles/pandora.css | 22 +- .../include/styles/visual_maps.css | 9 - .../operation/visual_console/legacy_view.php | 19 +- 10 files changed, 201 insertions(+), 129 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index 6e2ac73422..739e2495fa 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -408,7 +408,6 @@ $(document).ready (function () { }); $( "button[type=submit]" ).click(function( event ) { - console.log('aaaaaaaaaaa'); if (parseInt($('input[name=width]').val()) < 1024){ alert('Default width is '+$('input[name=width]').val()+'px, smaller than minimum -> 1024px'); $('input[name=width]').val('1024'); diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index eff0f416f1..3035fed8ae 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -202,15 +202,6 @@ function visual_map_main() { } } }); - - //Resize the view to adapt the screen size. - if ($("#main").length) { - //Console - $("#frame_view").height($("#main").height() - 75); - } else { - //Metaconsole - $("#frame_view").height($("#page").height() - 75); - } } function cancel_button_palette_callback() { @@ -2426,10 +2417,10 @@ function loadFieldsFromDB(item) { }); } -function setAspectRatioBackground(side) { +function setAspectRatioBackground(side, id) { toggle_item_palette(); - parameter = Array(); + var parameter = Array(); parameter.push({ name: "page", value: "include/ajax/visual_console_builder.ajax" @@ -2440,18 +2431,20 @@ function setAspectRatioBackground(side) { value: $("#background_img").attr("src") }); + parameter.push({ name: "id_visual_console", value: id }); + jQuery.ajax({ url: "ajax.php", data: parameter, type: "POST", dataType: "json", success: function(data) { - old_width = parseInt( + var old_width = parseInt( $("#background") .css("width") .replace("px", "") ); - old_height = parseInt( + var old_height = parseInt( $("#background") .css("height") .replace("px", "") @@ -2464,8 +2457,12 @@ function setAspectRatioBackground(side) { old_height = 768; } - img_width = data[0]; - img_height = data[1]; + var img_width = data[0]; + var img_height = data[1]; + + var ratio = 0; + var height = 0; + var width = 0; if (side == "width") { ratio = old_width / img_width; @@ -5821,14 +5818,14 @@ function deleteDB(idElement) { } function activeToolboxButton(id, active) { - if ($("input." + id + "[name=button_toolbox2]").length == 0) { + if ($("button." + id + "[name=" + id + "]").length == 0) { return; } if (active) { - $("input." + id + "[name=button_toolbox2]").removeAttr("disabled"); + $("button." + id + "[name=" + id + "]").removeAttr("disabled"); } else { - $("input." + id + "[name=button_toolbox2]").attr("disabled", true); + $("button." + id + "[name=" + id + "]").attr("disabled", true); } } @@ -6446,9 +6443,9 @@ function eventsBackground() { function move_elements_resize(original_width, original_height, width, height) { jQuery.each($(".item"), function(key, value) { - item = value; + var item = value; idItem = $(item).attr("id"); - classItem = $(item) + var classItem = $(item) .attr("class") .replace("item", "") .replace("ui-draggable", "") @@ -6456,22 +6453,22 @@ function move_elements_resize(original_width, original_height, width, height) { .replace(/^\s+/g, "") .replace(/\s+$/g, ""); - old_height = parseInt( + var old_height = parseInt( $(item) .css("top") .replace("px", "") ); - old_width = parseInt( + var old_width = parseInt( $(item) .css("left") .replace("px", "") ); - ratio_width = width / original_width; - ratio_height = height / original_height; + var ratio_width = width / original_width; + var ratio_height = height / original_height; - new_height = old_height * ratio_height; - new_width = old_width * ratio_width; + var new_height = old_height * ratio_height; + var new_width = old_width * ratio_width; var values = {}; diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 725dab7806..3d5b8864cd 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -92,14 +92,14 @@ html_print_input_hidden('metaconsole', (is_metaconsole() === true) ? 1 : 0); visual_map_editor_print_hack_translate_strings(); visual_map_editor_print_item_palette($visualConsole['id'], $background); -if (is_metaconsole() === false) { +if (is_metaconsole() === true) { echo '
'; } else { - echo '
'; + echo '
'; } echo '
'; +margin: 0px auto;border: 1px lightgray solid; width: '.$widthBackground.'px; height: '.$heightBackground.'px;background-color: '.$visualConsole['background_color'].';z-index:0;">'; echo "'; echo '
'; @@ -1435,12 +1493,12 @@ function visual_map_print_button_editor( ) { html_print_button( $label, - 'button_toolbox2', + $idDiv, $disabled, - "click_button_toolbox('".$idDiv."');", + 'click_button_toolbox("'.$idDiv.'");', [ - 'icon' => $class, - 'mode' => 'onlyIcon', + 'class' => $class.' float-'.$float, + 'mode' => 'onlyIcon', ], false, $imageButton diff --git a/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php b/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php index 8041cf77d9..f5c321403a 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php +++ b/pandora_console/include/lib/Dashboard/Widgets/BasicChart.php @@ -561,7 +561,6 @@ class BasicChart extends Widget global $config; $size = parent::getSize(); - hd($size, true); include_once $config['homedir'].'/include/functions_graph.php'; include_once $config['homedir'].'/include/functions_agents.php'; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 2bff29229b..72f4c3fd99 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4403,9 +4403,13 @@ span.log_zone_line_error { border: 1px solid red; } -#toolbox > input { - border-width: 0px 1px 0px 0px; - border-color: lightgray; +/* VISUAL MAP */ +#toolbox { + padding-top: 10px; +} + +#toolbox button { + margin: 0px 10px; } #toolbox > input.service_min { @@ -10422,12 +10426,24 @@ button.submitButton.onlyIcon.delete_item { -webkit-mask: url(../../images/delete.svg) no-repeat right / contain; } +button.buttonButton.onlyIcon.edit_item, +button.submitButton.onlyIcon.edit_item { + mask: url(../../images/edit.svg) no-repeat right / contain; + -webkit-mask: url(../../images/edit.svg) no-repeat right / contain; +} + button.buttonButton.onlyIcon.copy_item, button.submitButton.onlyIcon.copy_item { mask: url(../../images/copy.svg) no-repeat right / contain; -webkit-mask: url(../../images/copy.svg) no-repeat right / contain; } +button.buttonButton.onlyIcon.show_grid, +button.submitButton.onlyIcon.show_grid { + mask: url(../../images/WMI@svg.svg) no-repeat right / contain; + -webkit-mask: url(../../images/WMI@svg.svg) no-repeat right / contain; +} + button.buttonButton.link-create-item, button.submitButton.link-create-item { border-radius: 0; diff --git a/pandora_console/include/styles/visual_maps.css b/pandora_console/include/styles/visual_maps.css index f106dda76d..7bb126fcb7 100644 --- a/pandora_console/include/styles/visual_maps.css +++ b/pandora_console/include/styles/visual_maps.css @@ -99,15 +99,6 @@ div#vc-controls img.vc-qr { flex: inherit; } -input.vs_button_ghost { - background-color: transparent; - border: 1px solid #82b92e; - color: #82b92e; - text-align: center; - padding: 4px 12px; - font-weight: bold; -} - #toolbox #auto_save { padding-top: 5px; } diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php index c7831cc2a5..dab3ab39e7 100644 --- a/pandora_console/operation/visual_console/legacy_view.php +++ b/pandora_console/operation/visual_console/legacy_view.php @@ -202,20 +202,31 @@ if (!is_metaconsole()) { 'class' => 'invert_filter', ] ).''; - ui_print_page_header( + + ui_print_standard_header( $layout_name, 'images/visual_console.png', false, 'visual_console_view', false, - $options + $options, + [ + [ + 'link' => '', + 'label' => __('Topology maps'), + ], + [ + 'link' => '', + 'label' => __('Visual console'), + ], + ] ); } - // Set the hidden value for the javascript + // Set the hidden value for the javascript. html_print_input_hidden('metaconsole', 0); } else { - // Set the hidden value for the javascript + // Set the hidden value for the javascript. html_print_input_hidden('metaconsole', 1); } From 5b0092c019598835be9f434c43525c6f25bbe9d7 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 4 May 2023 12:55:52 +0200 Subject: [PATCH 2/3] fix legacy VC pandora_enterprise#11054 --- .../godmode/setup/setup_visuals.php | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index dc7d91872d..caee126804 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -70,6 +70,10 @@ html_print_input_hidden('update_config', 1); $performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control'])); +echo "'; + // ---------------------------------------------------------------------- // BEHAVIOUR CONFIGURATION // ---------------------------------------------------------------------- @@ -2243,9 +2247,22 @@ $(document).ready (function () { // Show the cache expiration conf or not. $("input[name=legacy_vc]").change(function (e) { if ($(this).prop("checked") === true) { - $("select#vc_default_cache_expiration_select").closest("tr").hide(); + $("select#vc_default_cache_expiration_select").closest("td").hide(); + $("#dialog-legacy-vc").dialog({ + modal: true, + width: 500, + buttons:[ + { + class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next', + text: "", + click: function(){ + $(this).dialog("close"); + } + } + ] + }); } else { - $("select#vc_default_cache_expiration_select").closest("tr").show(); + $("select#vc_default_cache_expiration_select").closest("td").show(); } }).change(); From 75eae248a5da34f7b58b8e7ee7f1431621abc2a2 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 4 May 2023 13:27:34 +0200 Subject: [PATCH 3/3] fixed visual errors in legacy VC pandora_enterprise#11054 --- .../operation/visual_console/legacy_view.php | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php index dab3ab39e7..1ded04792e 100644 --- a/pandora_console/operation/visual_console/legacy_view.php +++ b/pandora_console/operation/visual_console/legacy_view.php @@ -192,37 +192,37 @@ $options['view']['text'] = ''.html_print_image( + 'images/full_screen.png', + true, + [ + 'title' => __('Full screen mode'), + 'class' => 'invert_filter', + ] + ).''; + + ui_print_standard_header( + $layout_name, + 'images/visual_console.png', + false, + 'visual_console_view', + false, + $options, + [ + [ + 'link' => '', + 'label' => __('Topology maps'), + ], + [ + 'link' => '', + 'label' => __('Visual console'), + ], + ] + ); +} + if (!is_metaconsole()) { - if (!$config['pure']) { - $options['pure']['text'] = ''.html_print_image( - 'images/full_screen.png', - true, - [ - 'title' => __('Full screen mode'), - 'class' => 'invert_filter', - ] - ).''; - - ui_print_standard_header( - $layout_name, - 'images/visual_console.png', - false, - 'visual_console_view', - false, - $options, - [ - [ - 'link' => '', - 'label' => __('Topology maps'), - ], - [ - 'link' => '', - 'label' => __('Visual console'), - ], - ] - ); - } - // Set the hidden value for the javascript. html_print_input_hidden('metaconsole', 0); } else {