From 7add7432d55c103ff1e8cb79054afe4a0bf8b2d0 Mon Sep 17 00:00:00 2001 From: esanchezm Date: Wed, 13 May 2009 12:29:37 +0000 Subject: [PATCH] =?UTF-8?q?2009-05-13=20=20Esteban=20S=C3=A1nchez=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 | 42 +++++++++++++++++- pandora_console/general/header.php | 2 +- pandora_console/general/ui/agents_list.php | 27 +++++++++-- .../godmode/agentes/configurar_agente.php | 5 +-- pandora_console/images/add.png | Bin 733 -> 323 bytes pandora_console/images/application.png | Bin 464 -> 437 bytes pandora_console/images/application_double.png | Bin 533 -> 475 bytes pandora_console/images/application_edit.png | Bin 703 -> 660 bytes .../images/application_osx_terminal.png | Bin 525 -> 0 bytes pandora_console/images/arrow_refresh.png | Bin 685 -> 0 bytes pandora_console/images/asterisk_yellow.png | Bin 743 -> 0 bytes pandora_console/images/attach.png | Bin 391 -> 0 bytes pandora_console/images/book_edit.png | Bin 813 -> 795 bytes pandora_console/images/calendar_view_day.png | Bin 572 -> 603 bytes pandora_console/images/camera.png | Bin 665 -> 864 bytes pandora_console/images/clean.png | Bin 0 -> 773 bytes pandora_console/images/drive_network.png | Bin 585 -> 0 bytes pandora_console/images/drive_user.png | Bin 712 -> 0 bytes pandora_console/images/email.png | Bin 641 -> 566 bytes pandora_console/images/email_open.png | Bin 783 -> 550 bytes pandora_console/images/fullscreen.png | Bin 0 -> 650 bytes pandora_console/images/god3.png | Bin 804 -> 946 bytes pandora_console/images/group.png | Bin 753 -> 911 bytes pandora_console/images/heart.png | Bin 749 -> 788 bytes pandora_console/images/house.png | Bin 806 -> 606 bytes pandora_console/images/local_component.png | Bin 0 -> 762 bytes pandora_console/images/log-out.png | Bin 0 -> 799 bytes pandora_console/images/lupa.png | Bin 1065 -> 1267 bytes pandora_console/images/monitor.png | Bin 612 -> 662 bytes pandora_console/images/mouse.png | Bin 634 -> 720 bytes pandora_console/images/normalscreen.png | Bin 0 -> 678 bytes pandora_console/images/package.png | Bin 853 -> 540 bytes pandora_console/images/page_white.png | Bin 294 -> 341 bytes pandora_console/images/page_white_acrobat.png | Bin 591 -> 0 bytes pandora_console/images/page_white_magnify.png | Bin 554 -> 617 bytes pandora_console/images/page_white_text.png | Bin 342 -> 333 bytes pandora_console/images/paste_plain.png | Bin 605 -> 561 bytes pandora_console/images/pdf.png | Bin 591 -> 362 bytes pandora_console/images/rainbow.png | Bin 655 -> 0 bytes pandora_console/images/refresh.png | Bin 395 -> 912 bytes pandora_console/images/reporting.png | Bin 927 -> 704 bytes pandora_console/images/rosette.png | Bin 673 -> 830 bytes pandora_console/images/script.png | Bin 748 -> 516 bytes pandora_console/images/server.png | Bin 530 -> 668 bytes pandora_console/images/server_database.png | Bin 666 -> 613 bytes pandora_console/images/server_export.png | Bin 0 -> 714 bytes pandora_console/images/telephone.png | Bin 791 -> 0 bytes pandora_console/images/world.png | Bin 923 -> 928 bytes pandora_console/images/zoom.png | Bin 556 -> 935 bytes pandora_console/include/functions_agents.php | 7 +-- pandora_console/include/functions_db.php | 2 +- pandora_console/include/functions_modules.php | 8 ++-- pandora_console/include/styles/pandora.css | 5 ++- .../operation/agentes/networkmap.php | 4 +- pandora_console/operation/events/events.php | 4 +- .../operation/snmpconsole/snmp_view.php | 4 +- .../operation/visual_console/render_view.php | 4 +- 57 files changed, 88 insertions(+), 26 deletions(-) delete mode 100644 pandora_console/images/application_osx_terminal.png delete mode 100644 pandora_console/images/arrow_refresh.png delete mode 100644 pandora_console/images/asterisk_yellow.png delete mode 100644 pandora_console/images/attach.png create mode 100644 pandora_console/images/clean.png delete mode 100644 pandora_console/images/drive_network.png delete mode 100644 pandora_console/images/drive_user.png create mode 100644 pandora_console/images/fullscreen.png create mode 100644 pandora_console/images/local_component.png create mode 100644 pandora_console/images/log-out.png create mode 100644 pandora_console/images/normalscreen.png delete mode 100644 pandora_console/images/page_white_acrobat.png delete mode 100644 pandora_console/images/rainbow.png create mode 100644 pandora_console/images/server_export.png delete mode 100644 pandora_console/images/telephone.png 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 ''; ?>