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-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop' 

ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop

See merge request artica/pandorafms!2427
This commit is contained in:
Alejandro Fraguas 2019-05-17 12:11:19 +02:00
parent 833c2d91a7 b3d2eaaf9e
commit ea39766d59
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/class/NetworkMap.class.php
View File

@ -3467,19 +3467,18 @@ class NetworkMap
$output .= '<div id="arrow_minimap_'.$networkmap['id'].'"'; $output .= '<div id="arrow_minimap_'.$networkmap['id'].'"';
$output .= ' style="position: absolute; left: 0px; top: 0px;">'; $output .= ' style="position: absolute; left: 0px; top: 0px;">';
$output .= '<a title="'.__('Open Minimap').'" href="javascript: toggle_minimap();">'; $output .= '<a title="'.__('Open Minimap').'" href="javascript: toggle_minimap();">';
$output .= '<img id="image_arrow_minimap_'.$networkmap['id'].'"'; $output .= html_print_image('/images/minimap_open_arrow.png', true, ['id' => 'arrow_minimap_'.$networkmap['id']]);
$output .= ' src="images/minimap_open_arrow.png" />';
$output .= '</a><div></div></div>'; $output .= '</a><div></div></div>';
$output .= '<div id="hide_labels_'.$networkmap['id'].'"'; $output .= '<div id="hide_labels_'.$networkmap['id'].'"';
$output .= ' style="position: absolute; right: 10px; top: 10px;">'; $output .= ' style="position: absolute; right: 10px; top: 10px;">';
$output .= '<a title="'.__('Hide Labels').'" href="javascript: hide_labels();">'; $output .= '<a title="'.__('Hide Labels').'" href="javascript: hide_labels();">';
$output .= '<img id="image_hide_show_labels" src="images/icono_borrar.png" />'; $output .= html_print_image('/images/icono_borrar.png', true, ['id' => 'image_hide_show_labels']);
$output .= '</a></div>'; $output .= '</a></div>';
$output .= '<div id="holding_spinner_'.$networkmap['id'].'" '; $output .= '<div id="holding_spinner_'.$networkmap['id'].'" ';
$output .= ' style="display: none; position: absolute; right: 50px; top: 20px;">'; $output .= ' style="display: none; position: absolute; right: 50px; top: 20px;">';
$output .= '<img id="image_hide_show_labels" src="images/spinner.gif" />'; $output .= html_print_image('/images/spinner.png', true, ['id' => 'image_hide_show_labels']);
$output .= '</div>'; $output .= '</div>';
// Close networkconsole_id div. // Close networkconsole_id div.

4
pandora_console/include/javascript/functions_pandora_networkmap.js
View File

@ -1284,7 +1284,7 @@ function hide_labels_function() {
$("#hide_labels_" + networkmap_id + " > a").attr("title", "Show Labels"); $("#hide_labels_" + networkmap_id + " > a").attr("title", "Show Labels");
$("#hide_labels_" + networkmap_id + " > a > img").attr( $("#hide_labels_" + networkmap_id + " > a > img").attr(
"src", "src",
"images/icono_pintar.png" window.location.origin + "/pandora_console/images/icono_pintar.png"
); );
d3.selectAll(".node_text").style("display", "none"); 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").attr("title", "Hide Labels");
$("#hide_labels_" + networkmap_id + " > a > img").attr( $("#hide_labels_" + networkmap_id + " > a > img").attr(
"src", "src",
"images/icono_borrar.png" window.location.origin + "/pandora_console/images//icono_borrar.png"
); );
d3.selectAll(".node_text").style("display", ""); d3.selectAll(".node_text").style("display", "");