diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f61ec1e197..835bc4880d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,134 @@ +2011-06-28 Juan Manuel Ramon + + * extensions/module_groups/brick.png + images/skin/skin_default/images/agents_group.png + images/skin/skin_default/images/note.png + images/skin/skin_default/images/os_icons/android_small.png: Added + new icons. + + * include/styles/pandora.css + include/functions_ui.php + extensions/insert_data.php + extensions/system_info.php + extensions/pandora_logs.php + extensions/agents_modules.php + extensions/resource_registration.php + extensions/resource_exportation.php + extensions/module_groups.php + extensions/update_manager/main.php + extensions/plugin_registration.php + operation/extensions.php + operation/visual_console/render_view.php + operation/visual_console/index.php + operation/agentes/status_monitor.php + operation/agentes/alerts_status.php + operation/agentes/estado_ultimopaquete.php + operation/agentes/custom_fields.php + operation/agentes/estado_generalagente.php + operation/agentes/estado_agente.php + operation/agentes/status_events.php + operation/agentes/sla_view.php + operation/agentes/exportdata.php + operation/agentes/estado_monitores.php + operation/agentes/ver_agente.php + operation/agentes/group_view.php + operation/agentes/networkmap.php + operation/users/user_edit.php + operation/gis_maps/index.php + operation/events/events_list.php + operation/messages/message.php + operation/reporting/custom_reporting.php + images/skin/skin_default/include/styles/pandora.css + extras/pandora_diag.php + general/logon_ok.php + godmode/groups/modu_group_list.php + godmode/groups/configure_group.php + godmode/groups/configure_modu_group.php + godmode/groups/group_list.php + godmode/admin_access_logs.php + godmode/extensions.php + godmode/db/db_main.php + godmode/db/db_audit.php + godmode/db/db_sanity.php + godmode/db/db_refine.php + godmode/db/db_info.php + godmode/db/db_event.php + godmode/db/db_purge.php + godmode/agentes/agent_template.php + godmode/agentes/module_manager_editor_common.php + godmode/agentes/fields_manager.php + godmode/agentes/agent_conf_gis.php + godmode/agentes/module_manager.php + godmode/agentes/modificar_agente.php + godmode/agentes/configurar_agente.php + godmode/agentes/configure_field.php + godmode/agentes/planned_downtime.php + godmode/agentes/manage_config_remote.php + godmode/agentes/agent_manager.php + godmode/servers/recon_script.php + godmode/servers/plugin.php + godmode/servers/modificar_server.php + godmode/servers/manage_recontask_form.php + godmode/alerts/alert_list.list.php + godmode/alerts/configure_alert_compound.php + godmode/alerts/alert_compounds.php + godmode/alerts/configure_alert_template.php + godmode/alerts/alert_templates.php + godmode/alerts/configure_alert_action.php + godmode/alerts/configure_alert_command.php + godmode/alerts/alert_actions.php + godmode/alerts/alert_list.builder.php + godmode/alerts/alert_commands.php + godmode/snmpconsole/snmp_alert.php + godmode/snmpconsole/snmp_filters.php + godmode/setup/os.list.php + godmode/setup/news.php + godmode/setup/links.php + godmode/setup/setup.php + godmode/setup/performance.php + godmode/setup/setup_auth.php + godmode/setup/gis.php + godmode/setup/os.builder.php + godmode/setup/setup_visuals.php + godmode/users/user_list.php + godmode/users/configure_user.php + godmode/gis_maps/configure_gis_map.php + godmode/gis_maps/index.php + godmode/massive/massive_add_alerts.php + godmode/massive/massive_copy_modules.php + godmode/massive/massive_delete_agents.php + godmode/massive/massive_enable_disable_alerts.php + godmode/massive/massive_delete_profiles.php + godmode/massive/massive_edit_agents.php + godmode/massive/massive_delete_action_alerts.php + godmode/massive/massive_delete_modules.php + godmode/massive/massive_add_profiles.php + godmode/massive/massive_delete_alerts.php + godmode/massive/massive_edit_modules.php + godmode/massive/massive_standby_alerts.php + godmode/massive/massive_add_action_alerts.php + godmode/modules/manage_nc_groups_form.php + godmode/modules/manage_network_templates.php + godmode/modules/module_list.php + godmode/modules/manage_network_components_form_common.php + godmode/modules/manage_network_components_form_network.php + godmode/modules/manage_network_templates_form.php + godmode/modules/manage_network_components_form_wmi.php + godmode/modules/manage_network_components.php + godmode/modules/manage_nc_groups.php + godmode/reporting/visual_console_builder.wizard.php + godmode/reporting/graph_builder.main.php + godmode/reporting/reporting_builder.list_items.php + godmode/reporting/reporting_builder.main.php + godmode/reporting/visual_console_builder.data.php + godmode/reporting/graph_builder.graph_editor.php + godmode/reporting/reporting_builder.php + godmode/reporting/reporting_builder.item_editor.php + godmode/reporting/map_builder.php + godmode/reporting/graphs.php + godmode/tag/tag.php + godmode/tag/edit_tag.php: Css style improvements. + 2011-06-27 Vanessa Gil * include/functions_graph.php: Display units in the legend of module graph. diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 4d34cb0592..34cf90f9b5 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -162,7 +162,7 @@ function mainAgentsModules() { return; } - echo ''; + echo '
'; echo ""; diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php index aa4f5fef62..43c25ebba2 100644 --- a/pandora_console/extensions/insert_data.php +++ b/pandora_console/extensions/insert_data.php @@ -110,14 +110,15 @@ function mainInsertData() { echo ''; $table = null; - $table->width = '80%'; + $table->width = '98%'; $table->style = array(); $table->style[0] = 'font-weight: bolder;'; $table->data = array(); $table->data[0][0] = __('Agent'); + $src_code = html_print_image('images/lightning.png', true, false, true); $table->data[0][1] = html_print_input_text_extended ('id_agent', $id_agent, 'text_id_agent', '', 30, 100, false, '', - array('style' => 'background: url(images/lightning.png) no-repeat right;'), true) + array('style' => 'background: url(' . $src_code . ') no-repeat right;'), true) . ' ' . __("Type at least two characters to search") . ''; $table->data[1][0] = __('Module'); $modules = array (); diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php index 6eefa47b74..0818e7052d 100644 --- a/pandora_console/extensions/module_groups.php +++ b/pandora_console/extensions/module_groups.php @@ -275,6 +275,6 @@ function mainModuleGroups() { diff --git a/pandora_console/extensions/module_groups/brick.png b/pandora_console/extensions/module_groups/brick.png new file mode 100644 index 0000000000..f83bd06f89 Binary files /dev/null and b/pandora_console/extensions/module_groups/brick.png differ diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php index 538b6a6dc1..8b53ad311b 100644 --- a/pandora_console/extensions/pandora_logs.php +++ b/pandora_console/extensions/pandora_logs.php @@ -29,7 +29,7 @@ function view_logfile ($file_name) { else { $data = file_get_contents ($file_name); echo "

$file_name (".format_numeric(filesize ($file_name)/1024)." KB)

"; - echo "

"; } diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php index a682850b0e..576b7ac5f7 100644 --- a/pandora_console/extensions/plugin_registration.php +++ b/pandora_console/extensions/plugin_registration.php @@ -34,7 +34,7 @@ function pluginreg_extension_main () { if (!isset ($_FILES['plugin_upload']['tmp_name'])){ // Upload form echo ""; - echo '
".__("Agents")." / ".__("Modules")."
'; + echo '
'; echo "
"; echo ""; echo "
"; diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php index 80e896e613..547deae9eb 100644 --- a/pandora_console/extensions/resource_exportation.php +++ b/pandora_console/extensions/resource_exportation.php @@ -347,7 +347,7 @@ function resource_exportation_extension_main() { echo "

"; $table = null; - $table->width = '50%'; + $table->width = '98%'; $table->style[0] = 'width: 30%;'; $table->style[1] = 'width: 10%;'; $table->class = "databox_color"; diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php index 46fb1e5a22..40c7298109 100644 --- a/pandora_console/extensions/resource_registration.php +++ b/pandora_console/extensions/resource_registration.php @@ -836,7 +836,7 @@ function resource_registration_extension_main() { // Upload form echo "
"; - echo ''; + echo '
'; echo ""; echo ""; diff --git a/pandora_console/extensions/system_info.php b/pandora_console/extensions/system_info.php index c775af365d..da6f6198cd 100644 --- a/pandora_console/extensions/system_info.php +++ b/pandora_console/extensions/system_info.php @@ -158,7 +158,7 @@ function show_logfile($file_name, $numLines = 2000) { } else { echo "

" . $file_name . "

"; - echo ""; } @@ -263,7 +263,7 @@ function mainSystemInfo() { echo ""; $table = null; - $table->width = '80%'; + $table->width = '98%'; $table->align = array(); $table->align[1] = 'right'; if ($pandora_diag) { diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index bd7fc28d95..e992f9b154 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -157,7 +157,7 @@ if (check_acl ($config['id_user'], 0, 'PM')) { } else { echo '
'.__('There\'s a new update for Pandora FMS').'
'; - $table->width = '80%'; + $table->width = '98%'; $table->data = array (); $table->data[0][0] = ''.__('Id').''; @@ -187,7 +187,7 @@ if (check_acl ($config['id_user'], 0, 'PM')) { unset($table); - $table->width = '80%'; + $table->width = '98%'; $table->data = array (); $table->colspan[0][0] = 2; diff --git a/pandora_console/extras/pandora_diag.php b/pandora_console/extras/pandora_diag.php index c126160bf8..569b1ea01b 100644 --- a/pandora_console/extras/pandora_diag.php +++ b/pandora_console/extras/pandora_diag.php @@ -89,7 +89,7 @@ else { // Header ui_print_page_header (__('Pandora FMS Diagnostic tool'), "", false, "", true); - echo "
"; echo "
"; + echo "
"; echo ""; echo ""; } diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 6f5aac6cd1..5473e2dfdc 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -34,7 +34,7 @@ ui_print_page_header (__('Welcome to Pandora FMS Web Console')); // Site news ! // --------------------------------------------------------------------------- -echo '
'; +echo '
'; echo '

' . __('Site news') . '

'; switch ($config["dbtype"]) { case "mysql": @@ -66,7 +66,7 @@ echo '
'; // --------------------------------------------------------------------------- // Site stats (global!) // --------------------------------------------------------------------------- -echo '
'; +echo '
'; $data = reporting_get_group_stats (); $table->class = "databox"; @@ -145,13 +145,13 @@ foreach ($cells as $key => $row) { echo '
".__("Item")."".__("Data value")."
'; echo ""; -echo '
'; +echo '
'; echo "

"; // Show last activity from this user echo "

" . __('This is your last activity in Pandora FMS console') . "

"; -$table->width = 650; //Don't specify px +$table->width = '90%'; //Don't specify px $table->data = array (); $table->size = array (); $table->size[2] = '130px'; diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index 26bf267b41..bcf1cdbae9 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -43,7 +43,7 @@ $filter_text = get_parameter('filter_text', ''); $filter_hours_old = get_parameter('filter_hours_old', 24); $filter_ip = get_parameter('filter_ip', ''); -echo ""; +echo "
"; echo '
'; echo '
'; echo ''.__('Filter').'

'; diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index 6ca4153a9a..3910cb9435 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -42,7 +42,7 @@ if ($agentData === false) { } echo "
" .__("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "
"; -$table->width = '60%'; +$table->width = '85%'; $table->data = array(); $table->head[0] =__('Agent position'); diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index fbef6577d4..37e7639ca6 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -89,7 +89,7 @@ if ($disk_conf_delete) { echo ''; -$table->width = '95%'; +$table->width = '98%'; $table->class = "databox_color"; $table->head = array (); @@ -186,7 +186,7 @@ $table->data[7][1] = html_print_input_text ('comentarios', $comentarios, '', 45, html_print_table ($table); unset($table); -$table->width = '95%'; +$table->width = '98%'; $table->class = "databox_color"; $table->head = array (); @@ -251,7 +251,7 @@ if ($config['activate_gis']) { ui_toggle(html_print_table ($table, true), __('Advanced options')); unset($table); -$table->width = '95%'; +$table->width = '98%'; $table->class = "databox_color"; $table->head = array (); diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php index f03c0869ff..ecc3eb9a91 100644 --- a/pandora_console/godmode/agentes/agent_template.php +++ b/pandora_console/godmode/agentes/agent_template.php @@ -100,13 +100,12 @@ if (isset ($_POST["template_id"])) { // Main header -echo "

".__('Module templates')."

"; // ========================== // TEMPLATE ASSIGMENT FORM // ========================== -echo "

".__('Available templates')."

"; +echo "
"; echo ''; $nps = db_get_all_fields_in_table ("tnetwork_profile", "name"); @@ -121,13 +120,14 @@ foreach ($nps as $row) { echo '
'.__('Template'); html_print_select ($select, "template_id"); +echo ' '; html_print_submit_button (__('Assign'), 'crt', false, 'class="sub next"'); echo '
'; // ========================== // MODULE VISUALIZATION TABLE // ========================== -echo "

".__('Assigned modules')."

"; +echo "

".__('Assigned modules')."

"; switch ($config["dbtype"]) { case "mysql": @@ -143,7 +143,7 @@ if ($result === false) { $result = array (); } -$table->width = 700; +$table->width = '95%'; $table->cellpadding = 4; $table->cellspacing = 4; $table->class = "databox"; diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 302a289197..a673f066c8 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -111,6 +111,7 @@ $icon_path = ''; $update_gis_data = 0; $unit = ""; $id_tag = array(); +$tab_description = ''; $create_agent = (bool) get_parameter ('create_agent'); @@ -222,7 +223,7 @@ if ($id_agente) { /* Module tab */ $moduletab['text'] = '' - . html_print_image ("images/lightbulb.png", true, array ("title" =>__('Modules'))) + . html_print_image ("images/brick.png", true, array ("title" =>__('Modules'))) . ''; if($tab == 'module') @@ -312,8 +313,37 @@ if ($id_agente) { $onheader = $onheader + array($id => $extension_tab); } } + + // This add information to the header + switch ($tab) { + case "main": + $tab_description = '- '. __('Setup'); + break; + case "collection": + $tab_description = '- ' . __('Collection'); + break; + case "inventory": + $tab_description = '- ' . __('Inventory'); + break; + case "module": + $tab_description = '- '. __('Modules'); + break; + case "alert": + $tab_description = '- ' . __('Alert'); + break; + case "template": + $tab_description = '- ' . __('Templates'); + break; + case "gis": + $tab_description = '- ' . __('Gis'); + break; + case "extension": + break; + default: - ui_print_page_header (__('Agent configuration') . ' - ' . ui_print_truncate_text(agents_get_name ($id_agente), 25, false), "images/setup.png", false, "", true, $onheader); + } + + ui_print_page_header (__('Agent configuration') . ' - ' . ui_print_truncate_text(agents_get_name ($id_agente), 25, false) . ' ' . $tab_description, "images/setup.png", false, "", true, $onheader); } // Create agent @@ -937,6 +967,8 @@ switch ($tab) { break; case "alert": /* Because $id_agente is set, it will show only agent alerts */ + /* This var is for not display create button on alert list */ + $dont_display_alert_create_bttn = true; require ("godmode/alerts/alert_list.php"); break; case "template": diff --git a/pandora_console/godmode/agentes/configure_field.php b/pandora_console/godmode/agentes/configure_field.php index a6dff43749..154c1c6e0f 100755 --- a/pandora_console/godmode/agentes/configure_field.php +++ b/pandora_console/godmode/agentes/configure_field.php @@ -38,7 +38,7 @@ if ($id_field) { ui_print_page_header (__("Create agent custom field"), "images/note.png", false, "", true, ""); } -$table->width = '450px'; +$table->width = '98%'; $table->data = array (); $table->data[0][0] = __('Name'); $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true); diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php index 5263a8ab97..703c96ca63 100644 --- a/pandora_console/godmode/agentes/fields_manager.php +++ b/pandora_console/godmode/agentes/fields_manager.php @@ -87,7 +87,7 @@ if ($delete_field) { $fields = db_get_all_fields_in_table('tagent_custom_fields'); - $table->width = '65%'; + $table->width = '98%'; if ($fields) { $table->head = array (); $table->head[0] = __('Field'); diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php index af484d7f84..1525cea4c9 100644 --- a/pandora_console/godmode/agentes/manage_config_remote.php +++ b/pandora_console/godmode/agentes/manage_config_remote.php @@ -99,7 +99,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) { // Header ui_print_page_header (__("Remote configuration management"), "images/god1.png", false, "", true, ""); echo '
'; - echo ""; + echo "
"; // Source group echo '
'. __('Source group'). '

'; @@ -107,7 +107,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) { $group_select = users_get_groups ($config['id_user']); $grouplist = implode (',', array_keys ($group_select)); - echo html_print_select_groups($config['id_user'], "AR", true, 'id_group', $id_group, '', '', '', true); + echo html_print_select_groups($config['id_user'], "AR", true, 'id_group', $id_group, '', '', '', true, false, true, '', false, 'width:180px;'); echo '  '; echo ''; echo '

'; @@ -144,7 +144,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) { // Destination agent echo '
'; echo ''.__('To agent(s):').'

'; - echo ""; if ($id_group > 0) $sql1 = "SELECT * FROM tagente WHERE id_grupo = $id_group ORDER BY nombre "; else @@ -170,3 +170,18 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) { } ?> + + diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 67d39e4252..b0e60f3dbf 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -82,11 +82,11 @@ else { action='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente'>"; } -echo ""; +echo "
"; echo ""; echo "
".__('Group').""; -html_print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();', '', 0); +html_print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();', '', 0, false, false, true, '', false, 'width:100px;'); echo "