2009-05-13 Esteban Sánchez <estebans@artica.es>

* images/clean.png, images/fullscreen.png, images/local_component.png,
	images/log-out.png, images/normalscreen.png,
	images/server_export.png: Added to repository. New tango icons.

	* images/application_osx_terminal.png, images/arrow_refresh.png,
	images/asterisk_yellow.png, images/attach.png,
	images/drive_network.png, images/drive_user.png,
	images/page_white_acrobat.png, images/rainbow.png,
	images/telephone.png: Deleted from repository. Unused images.

	* images/add.png, images/application_double.png,
	images/application_edit.png, images/application.png,
	images/book_edit.png, images/calendar_view_day.png,
	images/camera.png, images/email_open.png, images/email.png,
	images/god3.png, images/group.png, images/heart.png,
	images/house.png, images/lupa.png, images/monitor.png,
	images/mouse.png, images/package.png, images/page_white_magnify.png,
	images/page_white.png, images/page_white_text.png,
	images/paste_plain.png, images/pdf.png,
	images/refresh.png, images/reporting.png, images/rosette.png,
	images/script.png, images/server_database.png, images/server.png,
	images/world.png, images/zoom.png: Updated to use tango icons.

	* general/ui/agents_list.php: Added pagination.

	* general/header.php: Logout icon replaced.

	* include/styles/pandora.css: Some styles for tabs.

	* include/functions_db.php: Changed export server icon.

	* operation/events/events.php, operation/snmpconsole/snmp_view.php,
	operation/visual_console/render_view.php,
	operation/agentes/networkmap.php: Changed fullscreen icons.

	* godmode/agentes/configurar_agente.php,
	include/functions_modules.php,
	include/functions_agents.php: Style correction.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1686 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,44 @@
+2009-05-12  Esteban Sánchez  <estebans@artica.es>
+
+	* images/clean.png, images/fullscreen.png, images/local_component.png,
+	images/log-out.png, images/normalscreen.png,
+	images/server_export.png: Added to repository. New tango icons.
+
+	* images/application_osx_terminal.png, images/arrow_refresh.png,
+	images/asterisk_yellow.png, images/attach.png,
+	images/drive_network.png, images/drive_user.png,
+	images/page_white_acrobat.png, images/rainbow.png,
+	images/telephone.png: Deleted from repository. Unused images.
+
+	* images/add.png, images/application_double.png,
+	images/application_edit.png, images/application.png,
+	images/book_edit.png, images/calendar_view_day.png,
+	images/camera.png, images/email_open.png, images/email.png,
+	images/god3.png, images/group.png, images/heart.png,
+	images/house.png, images/lupa.png, images/monitor.png,
+	images/mouse.png, images/package.png, images/page_white_magnify.png,
+	images/page_white.png, images/page_white_text.png,
+	images/paste_plain.png, images/pdf.png,
+	images/refresh.png, images/reporting.png, images/rosette.png,
+	images/script.png, images/server_database.png, images/server.png,
+	images/world.png, images/zoom.png: Updated to use tango icons.
+
+	* general/ui/agents_list.php: Added pagination.
+
+	* general/header.php: Logout icon replaced.
+
+	* include/styles/pandora.css: Some styles for tabs.
+
+	* include/functions_db.php: Changed export server icon.
+
+	* operation/events/events.php, operation/snmpconsole/snmp_view.php,
+	operation/visual_console/render_view.php,
+	operation/agentes/networkmap.php: Changed fullscreen icons.
+
+	* godmode/agentes/configurar_agente.php,
+	include/functions_modules.php,
+	include/functions_agents.php: Style correction.
+
 2009-05-12  Raul Mateos  <raulofpandora@gmail.com>
 
 	* include/config_process.php: Update build after last changes.
@@ -160,7 +201,6 @@
 
 	* godmode/agentes/planned_downtime.php: modified a i18n string.
 
->>>>>>> .r1669
 2009-04-24  Esteban Sánchez  <estebans@artica.es>
 
 	* godmode/agentes/module_manager.php: Added extra parameter to

pandora_console/general/header.php

@@ -52,7 +52,7 @@ if ($msg_cnt > 0) {
 
 //First column, second row (logout button)
 echo '<br /><br />';
-echo '<a class="white_bold" href="index.php?bye=bye"><img src="images/lock.png" alt="logout" class="bot" />&nbsp;'. __('Logout').'</a>';
+echo '<a class="white_bold" href="index.php?bye=bye"><img src="images/log-out.png" alt="logout" class="bot" />&nbsp;'. __('Logout').'</a>';
 
 // Second column (link to main page)
 echo '</td><td width="20%">';

pandora_console/general/ui/agents_list.php

@@ -34,7 +34,6 @@ if (is_ajax ()) {
 		
 		$table_renders = str_replace  ("\\\"", "\"", $_POST['table_renders']);
 		$table_renders = json_decode ($table_renders, true);
-		print_r ($fields);
 		$access = (string) get_parameter ('access', 'AR');
 		
 		foreach ($_POST as $field => $value) {
@@ -42,14 +41,13 @@ if (is_ajax ()) {
 			switch ($field) {
 			case 'page':
 			case 'search_agents':
-			case 'search':
 			case 'table_renders':
 			case 'fields':
 			case 'filter':
 			case 'access':
 				continue;
 			case 'search':
-				array_push ($filter, '(nombre LIKE "%%'.$value.'%%" OR descripcion LIKE "%%'.$value.'%%")');
+				array_push ($filter, '(nombre LIKE "%'.$value.'%" OR comentarios LIKE "%'.$value.'%")');
 				break;
 			case 'id_group':
 				if ($value == 1)
@@ -62,7 +60,16 @@ if (is_ajax ()) {
 			}
 		}
 		
+		$total_agents = get_agents ($filter, array ('COUNT(*) AS total'), $access);
+		
+		if ($total_agents !== false)
+			$total_agents = $total_agents[0]['total'];
+		else
+			$total_agents = 0;
+		$filter['limit'] = $config['block_size'];
+		$filter['offset'] = (int) get_parameter ('offset');
 		$agents = get_agents ($filter, $fields, $access);
+		
 		$all_data = array ();
 		if ($agents !== false) {
 			foreach ($agents as $agent) {
@@ -79,6 +86,7 @@ if (is_ajax ()) {
 		}
 		
 		echo json_encode ($all_data);
+		
 		return;
 	}
 	return;
@@ -137,9 +145,19 @@ $table->id = 'agents_table';
 $table->head = $table_heads;
 $table->align = $table_align;
 $table->size = $table_size;
+$table->style = array ();
 $table->data = array ();
 
+$total_agents = get_agents ($filter, array ('COUNT(*) AS total'), $access);
+if ($total_agents !== false)
+	$total_agents = $total_agents[0]['total'];
+else
+	$total_agents = 0;
+$filter['limit'] = $config['block_size'];
+$filter['offset'] = (int) get_parameter ('offset');
 $agents = get_agents ($filter, $fields, $access);
+unset ($filter['limit']);
+unset ($filter['offset']);
 
 echo '<div id="agents_loading" class="loading invisible">';
 echo '<img src="images/spinner.gif" />';
@@ -164,8 +182,11 @@ if ($agents !== false) {
 	}
 }
 
+echo '<div id="agents"'.($agents === false ? ' class="invisible"' : '').'>';
+pagination ($total_agents);
 print_table ($table);
 echo '</div>';
+echo '</div>';
 ?>
 <script type="text/javascript">
 /* <![CDATA[ */

pandora_console/godmode/agentes/configurar_agente.php

@@ -236,8 +236,7 @@ if ($create_agent) {
 }
 
 // Fix / Normalize module data
-// ===========================
-if (isset($_GET["fix_module"])){ 
+if (isset( $_GET["fix_module"])) { 
 	$id_module = get_parameter_get ("fix_module",0);
 	// get info about this module
 	$media = get_agentmodule_data_average ($id_module, 30758400); //Get average over the year
@@ -257,9 +256,7 @@ if (isset($_GET["fix_module"])){
 		__('Error normalizing module %s', $error));
 }
 
-// ================
 // Update AGENT
-// ================
 if (isset($_POST["update_agent"])) { // if modified some agent paramenter
 	$id_agente = (int) get_parameter_post ("id_agente");
 	$nombre_agente = (string) get_parameter_post ("agente");

pandora_console/include/functions_agents.php

@@ -198,9 +198,9 @@ function get_agents ($filter = false, $fields = false, $access = 'AR') {
 	if (! is_array ($filter))
 		$filter = array ();
 	
-	if (! isset ($filter['id_grupo']))
+	if (! isset ($filter['id_grupo'])) {
 		$filter['id_grupo'] = array_keys (get_user_groups (false, $access));
-	else
+	} else {
 		if (! is_array ($filter['id_grupo'])) {
 			if (! in_array ($filter['id_grupo'], array_keys (get_user_groups (false, $access))))
 				return false;
@@ -208,10 +208,11 @@ function get_agents ($filter = false, $fields = false, $access = 'AR') {
 			$user_groups = get_user_groups (false, $access);
 			foreach ($filter['id_grupo'] as $i => $id_group)
 				if (! isset ($user_groups[$id_group]))
-					unset ($filter['id_grupo'][$id]);
+					unset ($filter['id_grupo'][$i]);
 			if (count ($filter['id_grupo']) == 0)
 				$filter['id_grupo'] = $user_groups;
 		}
+	}
 	
 	return @get_db_all_rows_filter ('tagente', $filter, $fields);
 }

pandora_console/include/functions_db.php

@@ -2752,7 +2752,7 @@ function get_server_info ($id_server = -1) {
 			$id_modulo = 6;
 			break;
 		case 7:
-			$server["img"] = print_image ("images/bullet_go.png", true, array ("title" => __('Export Server')));
+			$server["img"] = print_image ("images/server_export.png", true, array ("title" => __('Export Server')));
 			$server["type"] = "export";
 			$id_modulo = 0;
 			break;

pandora_console/include/functions_modules.php

@@ -245,14 +245,14 @@ function get_network_component_group_name ($id_network_component_group) {
  *
  * @return True if the module was deleted. False if not.
  */
-function delete_agent_module ($id) {
-	$where = array ('id_agent_module' => $id);
+function delete_agent_module ($id_agent_module) {
+	$where = array ('id_agent_module' => $id_agent_module);
 	
 	process_sql_delete ('talert_template_modules', $where);
 	process_sql_delete ('tgraph_source', $where);
 	process_sql_delete ('treport_content', $where);
-	process_sql_delete ('tevento', array ('id_agentmodule' => $id));
-	$where = array ('id_agente_modulo' => $id);
+	process_sql_delete ('tevento', array ('id_agentmodule' => $id_agent_module));
+	$where = array ('id_agente_modulo' => $id_agent_module);
 	process_sql_delete ('tlayout_data', $where);
 	process_sql_delete ('tagente_estado', $where);
 	process_sql_update ('tagente_modulo',

pandora_console/include/styles/pandora.css

@@ -501,6 +501,8 @@ div.title_line {
 }
 /* TAB TITLE */
 #menu_tab_left .mn, #menu_tab_left ul, #menu_tab_left .mn ul {
+	color: #fff;
+	font-weight: bold;
 	padding: 0px 0px 0px 0px;
 	list-style: none;
 	margin: 0px 0px 0px 2px;
@@ -509,7 +511,8 @@ div.title_line {
 	float: left;
 	position: relative;
 }
-#menu_tab_left li a {
+#menu_tab_left li a, #menu_tab_left li span {
+	text-transform: uppercase;
 	background: #d84437;
 	padding: 2px 5px 2px 5px;
 	color: #fff;

pandora_console/operation/agentes/networkmap.php

@@ -299,11 +299,11 @@ function set_filter () {
 echo '<h2>'.__('Pandora Agents').' &raquo; '.__('Network Map').'&nbsp;';
 if ($pure == 1) {
 	echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;pure=0">';
-	print_image ("images/monitor.png", false, array ('title' => __('Normal screen'), 'alt' => __('Normal screen')));
+	print_image ("images/normalscreen.png", false, array ('title' => __('Normal screen'), 'alt' => __('Normal screen')));
 	echo '</a>';
 } else {
 	echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;pure=1">';
-	print_image ("images/monitor.png", false, array ('title' => __('Normal screen'), 'alt' => __('Normal screen')));
+	print_image ("images/fullscreen.png", false, array ('title' => __('Normal screen'), 'alt' => __('Normal screen')));
 	echo '</a>';
 }
 echo '</h2>';

pandora_console/operation/events/events.php

@@ -175,12 +175,12 @@ echo "<h2>".__('Events')." &raquo; ".__('Main event view'). "&nbsp;";
 
 if ($config["pure"] == 1) {
 	echo '<a target="_top" href="'.$url.'&amp;pure=0">';
-	print_image ("images/monitor.png", false, array ("title" => __('Normal screen')));
+	print_image ("images/normalscreen.png", false, array ("title" => __('Normal screen')));
 	echo '</a>';
 } else {
 	// Fullscreen
 	echo '<a target="_top" href="'.$url.'&amp;pure=1">';
-	print_image ("images/monitor.png", false, array ("title" => __('Full screen')));
+	print_image ("images/fullscreen.png", false, array ("title" => __('Full screen')));
 	echo '</a>';
 }
 echo "</h2>";

pandora_console/operation/snmpconsole/snmp_view.php

@@ -103,10 +103,10 @@ if (isset ($_POST["updatebt"])) {
 echo "<h2>" . __('SNMP console');
 
 if ($config["pure"]) {
-	echo '&nbsp;<a target="_top" href="'.$url.'&pure=0&refr=30"><img src="images/monitor.png" title="'.__('Normal screen').'" /></a>';
+	echo '&nbsp;<a target="_top" href="'.$url.'&pure=0&refr=30"><img src="images/normalscreen.png" title="'.__('Normal screen').'" /></a>';
 } else {
 	// Fullscreen
-	echo '&nbsp;<a target="_top" href="'.$url.'&pure=1&refr=0"><img src="images/monitor.png" title="'.__('Full screen').'" /></a>';
+	echo '&nbsp;<a target="_top" href="'.$url.'&pure=1&refr=0"><img src="images/fullscreen.png" title="'.__('Full screen').'" /></a>';
 }
 echo "</h2>";
 

pandora_console/operation/visual_console/render_view.php

@@ -58,11 +58,11 @@ echo "<h1>".$layout_name."&nbsp;&nbsp;";
 
 if ($config["pure"] == 0) {
 	echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'&amp;pure=1">';
-	print_image ("images/monitor.png", false, array ("title" => __('Full screen mode')));
+	print_image ("images/fullscreen.png", false, array ("title" => __('Full screen mode')));
 	echo "</a>";
 } else {
 	echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'">';
-	print_image ("images/monitor.png", false, array ("title" => __('Back to normal mode')));
+	print_image ("images/normalscreen.png", false, array ("title" => __('Back to normal mode')));
 	echo "</a>";
 }