diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5c8be6edf7..394e3ad081 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2014-08-21 Alejandro Gallardo + + * include/functions_networkmap.php, + operation/agentes/networkmap.dinamic.php, + operation/agentes/networkmap.php: Renamed some text + from 'dinamic' to 'dynamic'. + 2014-08-21 Alejandro Gallardo * images/radial_dynamic_network_icon.png: Added file. diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index c014158416..2844fdd3df 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -1583,8 +1583,8 @@ function networkmap_get_types () { $networkmap_types['topology'] = __('Create a new topology map'); $networkmap_types['groups'] = __('Create a new group map'); - $networkmap_types['dinamic'] = __('Create a new dinamic map'); - $networkmap_types['radial_dinamic'] = __('Create a new radial dinamic map'); + $networkmap_types['dinamic'] = __('Create a new dynamic map'); + $networkmap_types['radial_dynamic'] = __('Create a new radial dynamic map'); if ($is_enterprise !== ENTERPRISE_NOT_HOOK) { $enterprise_types = enterprise_hook('policies_get_networkmap_types'); @@ -1607,8 +1607,8 @@ function networkmap_get_filter_types () { $networkmap_types['topology'] = __('Topology'); $networkmap_types['groups'] = __('Group'); - $networkmap_types['dinamic'] = __('Dinamic'); - $networkmap_types['radial_dinamic'] = __('Radial dinamic'); + $networkmap_types['dinamic'] = __('Dynamic'); + $networkmap_types['radial_dynamic'] = __('Radial dynamic'); if ($is_enterprise !== ENTERPRISE_NOT_HOOK) { $enterprise_types = enterprise_hook('policies_get_networkmap_filter_types'); diff --git a/pandora_console/operation/agentes/networkmap.dinamic.php b/pandora_console/operation/agentes/networkmap.dinamic.php index c6dc146e21..4191c46722 100755 --- a/pandora_console/operation/agentes/networkmap.dinamic.php +++ b/pandora_console/operation/agentes/networkmap.dinamic.php @@ -28,7 +28,7 @@ if (! check_acl ($config['id_user'], 0, "AR")) { require_once ('include/functions_networkmap.php'); -if ($activeTab == "radial_dinamic") { +if ($activeTab == "radial_dynamic") { include_once("include/functions_graph.php"); echo "
"; @@ -38,7 +38,7 @@ if ($activeTab == "radial_dinamic") { $filter['group'] = $group; if (!empty($module_group)) $filter['module_group'] = $module_group; - + echo graph_monitor_wheel(600, 650, $filter); echo "
"; diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php index 2cd998f74a..19ac0d15a1 100644 --- a/pandora_console/operation/agentes/networkmap.php +++ b/pandora_console/operation/agentes/networkmap.php @@ -213,11 +213,11 @@ $buttons['topology'] = array('active' => $activeTab == 'topology', $buttons['dinamic'] = array('active' => $activeTab == 'dinamic', 'text' => '' . - html_print_image("images/dynamic_network_icon.png", true, array ("title" => __('Dinamic view'))) .''); + html_print_image("images/dynamic_network_icon.png", true, array ("title" => __('Dynamic view'))) .''); -$buttons['radial_dinamic'] = array('active' => $activeTab == 'radial_dinamic', - 'text' => '' . - html_print_image("images/radial_dynamic_network_icon.png", true, array ("title" => __('Radial dinamic view'))) .''); +$buttons['radial_dinamic'] = array('active' => $activeTab == 'radial_dynamic', + 'text' => '' . + html_print_image("images/radial_dynamic_network_icon.png", true, array ("title" => __('Radial dynamic view'))) .''); $combolist = '
'; @@ -281,10 +281,10 @@ switch ($activeTab) { $title = __('Policies view'); break; case 'dinamic': - $title = __('Dinamic view'); + $title = __('Dynamic view'); break; case 'radial_dinamic': - $title = __('Radial dinamic view'); + $title = __('Radial dynamic view'); break; } @@ -333,7 +333,7 @@ $table->data[0][] = __('Name:') . ' ' . html_print_input_text ('name', $name, '', 25, 50, true); $table->data[0][] = __('Group:') . ' ' . html_print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true); -if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_dinamic') { +if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_dynamic') { $table->data[0][] = __('Module group') . ' ' . html_print_select_from_sql (' SELECT id_mg, name @@ -345,7 +345,7 @@ if ($activeTab == 'topology') { html_print_checkbox ('show_snmp_modules', '1', $show_snmp_modules, true); } -if ($activeTab != 'dinamic' && $activeTab != 'radial_dinamic') { +if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') { $table->data[0][] = __('Layout') . ' ' . html_print_select ($layout_array, 'layout', $layout, '', '', '', true); } @@ -368,7 +368,7 @@ if ($activeTab == 'policies') { html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false); } -if ($activeTab != 'dinamic' && $activeTab != 'radial_dinamic') { +if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') { $table->data[1][] = __('No Overlap') . ' ' . html_print_checkbox ('nooverlap', '1', $nooverlap, true); } @@ -386,12 +386,12 @@ if (($activeTab == 'groups' || $activeTab == 'policies') && } } -if ($activeTab != 'dinamic' && $activeTab != 'radial_dinamic') { +if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') { $table->data[1][] = __('Simple') . ' ' . html_print_checkbox ('simple', '1', $simple, true); } -if ($activeTab != 'dinamic' && $activeTab != 'radial_dinamic') { +if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') { $table->data[1][] = __('Regenerate') . ' ' . html_print_checkbox ('regen', '1', $regen, true); } @@ -412,12 +412,12 @@ if ($pure == "1") { } -if ($activeTab != 'dinamic' && $activeTab != 'radial_dinamic') { +if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') { $table->data[1][] = __('Font') . ' ' . html_print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, true); } -if ($activeTab != 'radial_dinamic') { +if ($activeTab != 'radial_dynamic') { $table->data[2][] = __('Free text for search (*):') . ' ' . html_print_input_text('text_filter', $text_filter, '', 30, 100, true); } @@ -460,7 +460,7 @@ if ($id_networkmap != 0) { case 'dinamic': require_once('operation/agentes/networkmap.dinamic.php'); break; - case 'radial_dinamic': + case 'radial_dynamic': require_once('operation/agentes/networkmap.dinamic.php'); break; default: