diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fca57ba007..5d9282527c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,44 @@ +2009-05-12 Esteban Sánchez + + * 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 * 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 * godmode/agentes/module_manager.php: Added extra parameter to diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 9039e771d3..cedb5861bb 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -52,7 +52,7 @@ if ($msg_cnt > 0) { //First column, second row (logout button) echo '

'; -echo 'logout '. __('Logout').''; +echo 'logout '. __('Logout').''; // Second column (link to main page) echo ''; diff --git a/pandora_console/general/ui/agents_list.php b/pandora_console/general/ui/agents_list.php index 63f6d1f94d..0851f4ac62 100644 --- a/pandora_console/general/ui/agents_list.php +++ b/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 ''; ?>