diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a9e4bedde6..b013c8988e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-04-27 Sergio Martin <sergio.martin@artica.es> + + * include/functions_groups.php + include/functions_ui.php + operation/agentes/estado_ultimopaquete.php + operation/agentes/estado_generalagente.php + operation/agentes/estado_monitores.php + godmode/reporting/visual_console_builder.elements.php: Fixed several + title text in force icon (green donut) + + * operation/menu.php: Fixed missed "Edit my user" option + 2012-04-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es> * include/styles/pandora.css diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 4659df23ee..3ab1491a47 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -96,6 +96,9 @@ foreach ($layoutDatas as $layoutData) { case PERCENTILE_BAR: $table->data[$i + 1]['icon'] = html_print_image('images/chart_bar.png', true, array('title' => __('Percentile Bar'))); break; + case PERCENTILE_BUBBLE: + $table->data[$i + 1]['icon'] = html_print_image('images/dot_red.png', true, array('title' => __('Percentile Bubble'))); + break; case MODULE_GRAPH: $table->data[$i + 1]['icon'] = html_print_image('images/chart_curve.png', true, array('title' => __('Module Graph'))); break; diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 9ac01c579a..e04055f9a1 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -664,7 +664,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { echo "</td>"; echo "<td style='text-align: center; vertica-align: middle;'>"; if (check_acl ($config['id_user'], $id_group, "AW")) { - echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' . html_print_image("images/target.png", true, array("border" => '0')) . '</a>'; + echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>'; } echo "</td>"; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 28c85b3bdb..db80ad36e8 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -668,7 +668,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = ' if (! $compound) { if ($alert["force_execution"] == 0) { $data[$index['force_execution']] = - '<a href="'.$url.'&id_alert='.$alert["id"].'&force_execution=1&refr=60">' . html_print_image("images/target.png", true) . '</a>'; + '<a href="'.$url.'&id_alert='.$alert["id"].'&force_execution=1&refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>'; } else { $data[$index['force_execution']] = diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 533e0586bf..b370f02c34 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -83,7 +83,7 @@ else { } echo '<td class="datos"><b>'.$cellName.'</b></td>'; echo '<td class="datos" width="40"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&refr=60">' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a> '; -echo '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&flag_agent=1&id_agente='.$id_agente.'">' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Flag'), "alt" => "")) . '</a></td></tr>'; +echo '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&flag_agent=1&id_agente='.$id_agente.'">' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force'), "alt" => "")) . '</a></td></tr>'; //Addresses echo '<tr><td class="datos2"><b>'.__('IP Address').'</b></td>'; diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 1eb5489e14..6ba08c1f0b 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -253,7 +253,7 @@ foreach ($modules as $module) { $data = array (); if (($module["id_modulo"] != 1) && ($module["id_tipo_modulo"] != 100)) { if ($module["flag"] == 0) { - $data[0] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module["id_agente_modulo"].'&flag=1&refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => "target")) . '</a>'; + $data[0] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module["id_agente_modulo"].'&flag=1&refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>'; } else { $data[0] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module["id_agente_modulo"].'&refr=60">' . html_print_image("images/refresh.png", true, array("border" => "0", "alt" => "refresh")) . '</a>'; diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 9594f4043d..99f3ae7f04 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -311,7 +311,7 @@ foreach ($modules as $module) { // Has flag = 0 if ($write && $module["id_modulo"] > 1 && $module["id_tipo_modulo"] < 100) { if ($module["flag"] == 0) { - echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&id_agente_modulo=".$module["id_agente_modulo"]."&flag=1&tab=data&refr=60'>" . html_print_image('images/target.png', true, array("border" => '0', "alt" => "")) . "</a>"; + echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&id_agente_modulo=".$module["id_agente_modulo"]."&flag=1&tab=data&refr=60'>" . html_print_image('images/target.png', true, array("border" => '0', "alt" => __('Force'))) . "</a>"; } else { echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&id_agente_modulo=".$module["id_agente_modulo"]."&tab=data&refr=60'>" . html_print_image('images/refresh.png', true, array("border" => '0', "alt" => '')) . "</a>"; diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 242beb7b76..2f27e50d09 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -290,7 +290,6 @@ $sub["operation/users/user_edit"]["refr"] = 0; // ANY user can chat with other user and dogs. // Users -$sub = array(); $sub["operation/users/webchat"]["text"] = __('WebChat'); $sub["operation/users/webchat"]["refr"] = 0;