From 4d1ee91c4eb925f3d48cdda37828dbdee455abe5 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Tue, 10 May 2011 08:31:33 +0000 Subject: [PATCH] 2011-05-10 Juan Manuel Ramon * include/functions_visual_map.php include/ajax/visual_console_builder.ajax.php include/functions_ui.php include/functions_themes.php include/functions_ui_renders.php operation/visual_console/render_view.php operation/visual_console/index.php general/ui/agents_list.php godmode/setup/setup_visuals.php godmode/reporting/visual_console_builder.php godmode/reporting/visual_console_builder.editor.js godmode/reporting/visual_console_builder.elements.php godmode/reporting/visual_console_builder.preview.php godmode/reporting/visual_console_builder.editor.php godmode/reporting/map_builder.php: Functions in functions_themes.php, functions_ui_renders.php and functions_visual_map.php have "themes_", "ui_renders_" and "visual_map_" prefixes respectively. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 20 ++++++++ pandora_console/general/ui/agents_list.php | 4 +- .../godmode/reporting/map_builder.php | 4 +- .../visual_console_builder.editor.js | 4 +- .../visual_console_builder.editor.php | 22 ++++---- .../visual_console_builder.elements.php | 2 +- .../reporting/visual_console_builder.php | 4 +- .../visual_console_builder.preview.php | 2 +- .../godmode/setup/setup_visuals.php | 2 +- .../ajax/visual_console_builder.ajax.php | 8 +-- pandora_console/include/functions_themes.php | 2 +- pandora_console/include/functions_ui.php | 2 +- .../include/functions_ui_renders.php | 2 +- .../include/functions_visual_map.php | 50 +++++++++---------- .../operation/visual_console/index.php | 2 +- .../operation/visual_console/render_view.php | 2 +- 16 files changed, 76 insertions(+), 56 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7f9f0ec786..ebf1fd6230 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,23 @@ +2011-05-10 Juan Manuel Ramon + + * include/functions_visual_map.php + include/ajax/visual_console_builder.ajax.php + include/functions_ui.php + include/functions_themes.php + include/functions_ui_renders.php + operation/visual_console/render_view.php + operation/visual_console/index.php + general/ui/agents_list.php + godmode/setup/setup_visuals.php + godmode/reporting/visual_console_builder.php + godmode/reporting/visual_console_builder.editor.js + godmode/reporting/visual_console_builder.elements.php + godmode/reporting/visual_console_builder.preview.php + godmode/reporting/visual_console_builder.editor.php + godmode/reporting/map_builder.php: Functions in functions_themes.php, + functions_ui_renders.php and functions_visual_map.php have "themes_", + "ui_renders_" and "visual_map_" prefixes respectively. + 2011-05-10 Junichi Satoh * operation/agentes/estado_agente.php: Replaced get_agents() with diff --git a/pandora_console/general/ui/agents_list.php b/pandora_console/general/ui/agents_list.php index 9e3767d1ee..a31c66af6c 100644 --- a/pandora_console/general/ui/agents_list.php +++ b/pandora_console/general/ui/agents_list.php @@ -139,9 +139,9 @@ if ($agents !== false) { $data = array (); foreach ($table_renders as $name => $values) { if (! is_numeric ($name)) { - array_push ($data, render_agent_field ($agent, $name, $values, true)); + array_push ($data, renders_agent_field ($agent, $name, $values, true)); } else { - array_push ($data, render_agent_field ($agent, $values, false, true)); + array_push ($data, renders_agent_field ($agent, $values, false, true)); } } array_push ($table->data, $data); diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index e1145361d4..c2bfda2ddd 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -118,9 +118,9 @@ $table->align[4] = 'center'; // Only display maps of "All" group if user is administrator or has "PM" privileges, otherwise show only maps of user group $own_info = get_user_info ($config['id_user']); if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) - $maps = get_user_layouts (); + $maps = visual_map_get_user_layouts (); else - $maps = get_user_layouts ($config['id_user'], false, false, false); + $maps = visual_map_get_user_layouts ($config['id_user'], false, false, false); if (!$maps) { echo '
'.('No maps defined').'
'; diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index fde17abe17..4bd89cde45 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -725,7 +725,7 @@ function getImageElement(id_data) { return img; } -function getColorLineStatus(id) { +function visual_map_get_color_line_status(id) { var parameter = Array(); parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"}); parameter.push ({name: "action", value: "get_color_line"}); @@ -879,7 +879,7 @@ function createItem(type, values, id_data) { var line = {"id": id_data, "node_begin": values['parent'], "node_end": id_data, - "color": getColorLineStatus(id_data) }; + "color": visual_map_get_color_line_status(id_data) }; lines.push(line); refresh_lines(lines, 'background'); diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index ea5ff110c1..13f2b03ff8 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -61,15 +61,15 @@ foreach ($all_images as $image_file) { echo '
'; echo '
'; - printButtonEditorVisualConsole('static_graph', __('Static Graph'), 'left', false, 'camera_min', true); - printButtonEditorVisualConsole('percentile_bar', __('Percentile Bar'), 'left', false, 'percentile_min', true); - printButtonEditorVisualConsole('module_graph', __('Module Graph'), 'left', false, 'graph_min', true); - printButtonEditorVisualConsole('simple_value', __('Simple Value'), 'left', false, 'binary_min', true); - printButtonEditorVisualConsole('label', __('Label'), 'left', false, 'label_min', true); - printButtonEditorVisualConsole('icon', __('Icon'), 'left', false, 'icon_min', true); + visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true); + visual_map_print_button_editor('percentile_bar', __('Percentile Bar'), 'left', false, 'percentile_min', true); + visual_map_print_button_editor('module_graph', __('Module Graph'), 'left', false, 'graph_min', true); + visual_map_print_button_editor('simple_value', __('Simple Value'), 'left', false, 'binary_min', true); + visual_map_print_button_editor('label', __('Label'), 'left', false, 'label_min', true); + visual_map_print_button_editor('icon', __('Icon'), 'left', false, 'icon_min', true); - printButtonEditorVisualConsole('edit_item', __('Edit item'), 'right', true, 'config_min', true); - printButtonEditorVisualConsole('delete_item', __('Delete item'), 'right', true, 'delete_min', true); + visual_map_print_button_editor('edit_item', __('Edit item'), 'right', true, 'config_min', true); + visual_map_print_button_editor('delete_item', __('Delete item'), 'right', true, 'delete_min', true); echo '
'; echo '
'; echo '
'; @@ -231,7 +231,7 @@ echo '