From 2ec33eb22cac5b7732587665eed57c4ef019bd7c Mon Sep 17 00:00:00 2001
From: javilanz <noreply@pandorafms.org>
Date: Wed, 19 Jan 2011 13:50:22 +0000
Subject: [PATCH] 2011-01-19 Javier Lanz <javier.lanz@artica.es> 	*
 extensions/module_groups.php: Added truncation and scroll bar 	*
 operation/agentes/status_monitor.php: Fixed combobox functionality 	*
 general/logon_ok.php: Added a scroll bar at the bottom 	*
 godmode/groups/modu_group_list.php: Truncated module groups name

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3749 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                            | 6 ++++++
 pandora_console/extensions/module_groups.php         | 9 +++++++--
 pandora_console/general/logon_ok.php                 | 2 ++
 pandora_console/godmode/groups/modu_group_list.php   | 2 +-
 pandora_console/operation/agentes/status_monitor.php | 8 ++++----
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 30391080d0..955b1a5aa5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-19 Javier Lanz <javier.lanz@artica.es>
+	* extensions/module_groups.php: Added truncation and scroll bar
+	* operation/agentes/status_monitor.php: Fixed combobox functionality
+	* general/logon_ok.php: Added a scroll bar at the bottom
+	* godmode/groups/modu_group_list.php: Truncated module groups name
+
 2011-01-18  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions.php: in function "format_for_graph" added the units
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 4661eede56..436b321495 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -105,7 +105,11 @@ function mainModuleGroups() {
 	$agentGroups = get_user_groups ($config['id_user'], "AR", false);
 	$modelGroups = get_all_model_groups();
 	array_walk($modelGroups, 'translate'); //Translate all head titles to language is set
-	
+
+	foreach ($modelGroups as $i => $n) {
+		$modelGroups[$i] = printTruncateText($n, 20);
+	}
+
 	$head = $modelGroups;
 	array_unshift($head, '&nbsp;');
 	
@@ -204,8 +208,9 @@ function mainModuleGroups() {
 		array_push($tableData,$row);
 	}
 	$table->data = $tableData;
-	
+	echo "<div style='width:98%; overflow-x:scroll;'>";
 	print_table($table);
+	echo "</div>";
 	
 	echo "<p>" . __("The colours meaning:") .
 		"<ul style='float: left;'>" .
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 9c5e3b7e76..753f2456be 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -172,6 +172,8 @@ foreach ($sessions as $session) {
 	
 	array_push ($table->data, $data);
 }
+echo "<div style='width:100%; overflow-x:scroll;'>";
 print_table ($table);
+echo "</div>";
 echo "</div>"; // activity
 ?>
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index 6ba5dc7fc1..3864a495ef 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.php
@@ -131,7 +131,7 @@ foreach ($groups as $id_group ) {
 //		$data[0] = '<img src="images/groups_small/'.$group["icon"].'.png" border="0">';
 //	else
 //		$data[0] = '&nbsp;';
-	$data[0] = '<strong><a href="index.php?sec=gagente&sec2=godmode/groups/configure_modu_group&id_group='.$id_group["id_mg"].'">'.$id_group["name"].'</a></strong>';
+	$data[0] = '<strong><a href="index.php?sec=gagente&sec2=godmode/groups/configure_modu_group&id_group='.$id_group["id_mg"].'">'.printTruncateText($id_group["name"], 50).'</a></strong>';
 //	$data[2] = get_group_name ($group["parent"]);
 //	$data[3] = $group['disabled'] ? __('Disabled') : __('Enabled');
 	$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/groups/modu_group_list&id_group='.$id_group["id_mg"].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;"><img border="0" src="images/cross.png"></a>';
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index cf8561b70f..1f762803fb 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -66,22 +66,22 @@ echo '</td>';
 echo '<td valign="middle">'.__('Module group').'</td>';
 echo '<td valign="middle">';
 print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
-	'modulegroup', $modulegroup, '',__('All'), 0, false, false, true, false, 'width: 100px;');
+	'modulegroup', $modulegroup, 'this.form.submit();',__('All'), 0, false, false, true, false, 'width: 100px;');
 
 echo '</td></tr><tr><td valign="middle">'.__('Module name').'</td>';
 echo '<td valign="middle">';
 
 $user_groups = implode (",", array_keys (get_user_groups ()));
-$user_agents = implode (",", array_keys (get_group_agents($user_groups)));
+$user_agents = array_keys (get_group_agents($user_groups));
 
 $modules = get_db_all_rows_filter ('tagente_modulo', array('id_agente' => $user_agents, 'nombre' => '<>delete_pending'), 'DISTINCT(nombre)');
 print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
 	$ag_modulename, 'this.form.submit();', __('All'), '', false, false, true, '', false, 'width: 150px;');
 
-echo '</td><td valign="middle">'.__('Search').'</td>';
+echo '</td><td valign="middle" align="right">'.__('Search').'</td>';
 
 echo '<td valign="middle">';
-print_input_text ("ag_freestring", $ag_freestring, '', 15,30, false);
+print_input_text ("ag_freestring", $ag_freestring, '', 20,30, false);
 
 echo '</td><td valign="middle">';
 print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"');