tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6206 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-04-27 11:13:03 +00:00
parent a6e718b6b9
commit 862e2e6ae8
8 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -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

3
pandora_console/godmode/reporting/visual_console_builder.elements.php
View File

@ -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;

2
pandora_console/include/functions_groups.php
View File

@ -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>";

2
pandora_console/include/functions_ui.php
View File

@ -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.'&amp;id_alert='.$alert["id"].'&amp;force_execution=1&refr=60">' . html_print_image("images/target.png", true) . '</a>';
'<a href="'.$url.'&amp;id_alert='.$alert["id"].'&amp;force_execution=1&refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>';
}
else {
$data[$index['force_execution']] =

2
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -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&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a>&nbsp;';
echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;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&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;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>';

2
pandora_console/operation/agentes/estado_monitores.php
View File

@ -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&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;flag=1&amp;refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => "target")) . '</a>';
$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;flag=1&amp;refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>';
}
else {
$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;refr=60">' . html_print_image("images/refresh.png", true, array("border" => "0", "alt" => "refresh")) . '</a>';

2
pandora_console/operation/agentes/estado_ultimopaquete.php
View File

@ -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&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;flag=1&amp;tab=data&amp;refr=60'>" . html_print_image('images/target.png', true, array("border" => '0', "alt" => "")) . "</a>";
echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;flag=1&amp;tab=data&amp;refr=60'>" . html_print_image('images/target.png', true, array("border" => '0', "alt" => __('Force'))) . "</a>";
}
else {
echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;tab=data&amp;refr=60'>" . html_print_image('images/refresh.png', true, array("border" => '0', "alt" => '')) . "</a>";

1
pandora_console/operation/menu.php
View File

@ -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;