From 5f95a1be605a29c01ef9abb7b7dd81473e4e0bc9 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 14 Oct 2016 14:21:45 +0200 Subject: [PATCH] New networkmaps in progress... (To much changes in the hell) --- .../include/functions_pandora_networkmap.php | 25 +-- .../functions_pandora_networkmap.js | 176 +++++++++--------- .../operation/agentes/networkmap.dinamic.php | 2 +- .../agentes/pandora_networkmap.view.php | 32 ++-- 4 files changed, 125 insertions(+), 110 deletions(-) diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php index 0d26031172..b54d7cfbc9 100644 --- a/pandora_console/include/functions_pandora_networkmap.php +++ b/pandora_console/include/functions_pandora_networkmap.php @@ -1211,11 +1211,12 @@ function migrate_older_open_maps($id) { return true; } -function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations = array()) { +function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations = array(), $dashboard_mode = false) { global $config; - $clean_relations = clean_duplicate_links($nodes_and_relations['relations']); + $hide_minimap = ""; + $nodes_and_relations['relations'] = $clean_relations; $networkmap = db_get_row('tmap', 'id', $id); @@ -1227,19 +1228,22 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations = ui_require_css_file("jquery.contextMenu", 'include/javascript/'); echo ''; echo ''; - echo '
'; - - echo ' + echo '
'; + if ($dashboard_mode) { + $hide_minimap = "none"; + } + echo '
'; + echo ' '; - echo '
+ echo ''; + echo '
'; - echo '
+ echo '
@@ -1247,7 +1251,6 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations = echo '
'; - ?>