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

2010-01-17 Javier Lanz <javier.lanz@artica.es> 

* trunk/pandora_console/include/functions_ui.php: Fixed an error in print_agent_name
	* trunk/pandora_console/extensions/module_groups.php: Fixed extension, now works properly. Fix #3160077
	* trunk/pandora_console/operation/agentes/estado_generalagente.php: Truncated agent & module names
	* trunk/pandora_console/godmode/reporting/visual_console_builder.elements.php: Fixed table style


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3747 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
javilanz 2011-01-17 17:03:38 +00:00
parent 306086efdb
commit 3490e12ec8
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-01-17 Javier Lanz <javier.lanz@artica.es>
* trunk/pandora_console/include/functions_ui.php: Fixed an error in print_agent_name
* trunk/pandora_console/extensions/module_groups.php: Fixed extension, now works properly. Fix #3160077
* trunk/pandora_console/operation/agentes/estado_generalagente.php: Truncated agent & module names
* trunk/pandora_console/godmode/reporting/visual_console_builder.elements.php: Fixed table style
2010-01-16 Raúl Mateos <raulofpandora@gmail.com>
* pandoradb.sql, extras/pandoradb_migrate_v3.2_to_v4.0.sql: Updated

4
pandora_console/extensions/module_groups.php
View File

@ -126,7 +126,7 @@ function mainModuleGroups() {
$row = array();
array_push($row, $name);
array_push($row, printTruncateText($name, 20));
foreach ($modelGroups as $idModelGroup => $modelGroup) {
$query = sprintf($sql,$idAgentGroup, $idModelGroup);
@ -157,7 +157,7 @@ function mainModuleGroups() {
$count = 0;
foreach ($states as $idState => $state) {
$count = $state;
$count += $state;
}
$color = 'transparent'; //Defaut color for cell

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

@ -66,11 +66,18 @@ $table->head = array ();
$table->head['icon'] = '';
$table->head[0] = __('Label') . ' / ' . __('Agent');
$table->head[1] = __('Image') . ' / ' . __('Module');
$table->head[2] = __('Width x Height - Max value');
$table->head[2] = __('Width x Height<br>Max value');
$table->head[3] = __('Period') . ' / ' . __('Position');
$table->head[4] = __('Parent') . ' / ' . __('Map linked');
$table->head[5] = __('Action');
$table->align[0] = "center";
$table->align[1] = "center";
$table->align[2] = "center";
$table->align[3] = "center";
$table->align[4] = "center";
$table->align[5] = "center";
$table->data = array();
//Background

2
pandora_console/include/functions_ui.php
View File

@ -351,7 +351,7 @@ function print_agent_name ($id_agent, $return = false, $cutoff = 0, $style = '',
$agent_name = (string) get_agent_name ($id_agent);
$agent_name_full = $agent_name;
if($cutname) {
$agent_name = printTruncateText($agent_name, $cutname);
$agent_name = printTruncateText($agent_name, $cutoff);
}
$output = '<a style="' . $style . '" href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agent.'" title="'.$agent_name_full.'"><b>'.$agent_name.'</b></a>';

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

@ -69,10 +69,10 @@ echo '<table cellspacing="4" cellpadding="4" border="0" class="databox">';
//Agent name
echo '<tr><td class="datos"><b>'.__('Agent name').'</b></td>';
if ($agent['disabled']) {
$cellName = "<em>" . print_agent_name ($agent["id_agente"], true, "upper") .print_help_tip(__('Disabled'), true) . "</em>";
$cellName = "<em>" . print_agent_name ($agent["id_agente"], true, 35, "upper", true) .print_help_tip(__('Disabled'), true) . "</em>";
}
else {
$cellName = print_agent_name ($agent["id_agente"], true, "upper");
$cellName = print_agent_name ($agent["id_agente"], true, 35, "upper", true);
}
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"><img src="images/refresh.png" border="0" title="'.__('Refresh data').'" alt="" /></a>&nbsp;';
@ -115,7 +115,7 @@ echo '<tr><td class="datos"><b>'.__('Group').'</b></td>';
echo '<td class="datos" colspan="2">';
echo print_group_icon ($agent["id_grupo"], true);
echo '&nbsp;(<b>';
echo get_group_name ($agent["id_grupo"]);
echo printTruncateText(get_group_name ($agent["id_grupo"]));
echo '</b>)</td></tr>';
// Agent version