From 1bfd91725e6401f77ce0f67655348d70f9188b3e Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 16 May 2019 17:13:14 +0200 Subject: [PATCH 1/2] Changed to hmtl_print_image Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472 --- pandora_console/include/class/NetworkMap.class.php | 7 +++---- .../include/javascript/functions_pandora_networkmap.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php index d5e9056be5..90e2f2a0d4 100644 --- a/pandora_console/include/class/NetworkMap.class.php +++ b/pandora_console/include/class/NetworkMap.class.php @@ -3467,19 +3467,18 @@ class NetworkMap $output .= '
'; - $output .= ' 'arrow_minimap_'.$networkmap['id']]); $output .= '
'; $output .= '
'; - $output .= ''; + $output .= html_print_image('/images/icono_borrar.png', true, ['id' => 'image_hide_show_labels']); $output .= '
'; $output .= '
'image_hide_show_labels']); $output .= '
'; // Close networkconsole_id div. diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index 5c5f5026e5..cc20c90deb 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -1284,7 +1284,7 @@ function hide_labels_function() { $("#hide_labels_" + networkmap_id + " > a").attr("title", "Show Labels"); $("#hide_labels_" + networkmap_id + " > a > img").attr( "src", - "images/icono_pintar.png" + window.location.origin + "/pandora_console/images/icono_pintar.png" ); d3.selectAll(".node_text").style("display", "none"); @@ -1297,7 +1297,7 @@ function show_labels_function() { $("#hide_labels_" + networkmap_id + " > a").attr("title", "Hide Labels"); $("#hide_labels_" + networkmap_id + " > a > img").attr( "src", - "images/icono_borrar.png" + window.location.origin + "/pandora_console/icono_borrar.png" ); d3.selectAll(".node_text").style("display", ""); From b3d2eaaf9e65e30cfe1d130242d46b6e8dda7de7 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 16 May 2019 17:25:18 +0200 Subject: [PATCH 2/2] Fixed img url on js Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0 --- .../include/javascript/functions_pandora_networkmap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index cc20c90deb..c2335903d7 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -1297,7 +1297,7 @@ function show_labels_function() { $("#hide_labels_" + networkmap_id + " > a").attr("title", "Hide Labels"); $("#hide_labels_" + networkmap_id + " > a > img").attr( "src", - window.location.origin + "/pandora_console/icono_borrar.png" + window.location.origin + "/pandora_console/images//icono_borrar.png" ); d3.selectAll(".node_text").style("display", "");