diff --git a/pandora_console/operation/maps/networkmap_editor.php b/pandora_console/operation/maps/networkmap_editor.php index 37156f1d2a..b9f6efd501 100644 --- a/pandora_console/operation/maps/networkmap_editor.php +++ b/pandora_console/operation/maps/networkmap_editor.php @@ -184,11 +184,21 @@ if ($not_found) { ui_print_error_message(__('Not found networkmap')); } else { + $url_action = 'index.php?sec=maps&sec2=operation/maps/networkmap_list'; + if (is_metaconsole()) { + $url_action = 'index.php?sec=screen&sec2=screens/screens'; + } + if ($edit_networkmap && enterprise_installed()) { - echo '
'; + echo ''; } else { - echo ''; + echo ''; } diff --git a/pandora_console/operation/maps/networkmap_list.php b/pandora_console/operation/maps/networkmap_list.php index d34ed06f99..7ce3bfa875 100644 --- a/pandora_console/operation/maps/networkmap_list.php +++ b/pandora_console/operation/maps/networkmap_list.php @@ -427,31 +427,57 @@ else { } if (!empty($networkmap['id_user'])) { - $data['group'] = __('Private for (%s)', $networkmap['id_user']); + $data['groups'] = __('Private for (%s)', $networkmap['id_user']); } else { $data['groups'] = ui_print_group_icon($networkmap['id_group'], true); } - $data['copy'] = '' . + 'duplicate_networkmap=1&id_networkmap=' . $networkmap['id']; + if (is_metaconsole()) { + $url_duplicate = 'index.php?' . + 'sec=screen&' . + 'sec2=screens/screens&action=networkmap&' . + 'duplicate_networkmap=1&id_networkmap=' . $networkmap['id']; + } + $data['copy'] = '' . html_print_image("images/copy.png", true) . ''; - $data['edit'] = '' . - html_print_image("images/edit.png", true) . ''; - $data['delete'] = '' . + html_print_image("images/edit.png", true) . ''; + + + $url_delete = 'index.php?' . + 'sec=maps&' . + 'sec2=operation/maps/networkmap_list&' . + 'delete_networkmap=1&id_networkmap=' . $networkmap['id']; + if (is_metaconsole()) { + $url_delete = 'index.php?' . + 'sec=screen&' . + 'sec2=screens/screens&action=networkmap&' . + 'delete_networkmap=1&id_networkmap=' . $networkmap['id']; + } + $data['delete'] = '' . html_print_image('images/cross.png', true) . ''; + + $data['delete'] .= html_print_checkbox("delete_id[" . $networkmap['id'] . "]", 1, false, true); @@ -461,17 +487,20 @@ else { } html_print_table($table); } -echo ''; -html_print_input_hidden ('multiple_delete', 1); -html_print_input_hidden ('ids_multiple_delete', ""); -html_print_button(__('Delete'), 'del', false, 'submit_multiple_delete();', 'class="sub delete"'); -echo '
'; + $action_url = 'index.php?sec=maps&sec2=operation/maps/networkmap_editor'; if (is_metaconsole()) { $action_url = 'index.php?sec=screen&sec2=screens/screens'; } + +echo '
'; +html_print_input_hidden ('multiple_delete', 1); +html_print_input_hidden ('ids_multiple_delete', ""); +html_print_button(__('Delete'), 'del', false, 'submit_multiple_delete();', 'class="sub delete"'); +echo '
'; + echo '
'; html_print_input_hidden ('create_networkmap', 1); html_print_submit_button (__('Create'), "crt", false, 'class="sub next"');