From 78b5a07e3141191fc36cb110f3788b1bae48bdaa Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 30 Apr 2013 07:23:40 +0000 Subject: [PATCH] 2013-04-30 Sergio Martin * include/styles/pandora.css include/functions_groups.php: Fix a little the groups view style * operation/agentes/estado_generalagente.php: Fix the layout of the agent main view table when url addres is setted for bug #3609651 * general/header.php: Remove completly the link of the autorefresh button from the header when is disabled to avoid confusing git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8085 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 +++++++++++ pandora_console/general/header.php | 14 +++++++---- pandora_console/include/functions_groups.php | 4 ++-- pandora_console/include/styles/pandora.css | 9 ++++++++ .../agentes/estado_generalagente.php | 23 ++++++++----------- 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cb0c8e5bbf..1c52dc231d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2013-04-30 Sergio Martin + + * include/styles/pandora.css + include/functions_groups.php: Fix a little the + groups view style + + * operation/agentes/estado_generalagente.php: Fix the + layout of the agent main view table when url addres is + setted for bug #3609651 + + * general/header.php: Remove completly the link of + the autorefresh button from the header when is disabled + to avoid confusing + 2013-04-29 Sergio Martin * include/styles/pandora.css diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index f8ecb82fb4..a388c5d277 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -127,17 +127,21 @@ config_check(); $autorefresh_additional .= html_print_select ($values, 'ref', '', '', __('Select'), '0', true, false, false); $autorefresh_additional .= ''; unset ($values); + + $autorefresh_link_open_img = ''; + $autorefresh_link_open_txt = ''; + $autorefresh_link_close = ''; } else { - $autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Disabled autorefresh'))); + $autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot autorefresh_disabled', "alt" => 'lightning', 'title' => __('Disabled autorefresh'))); $ignored_params['refr'] = false; + + $autorefresh_link_open_img = ''; + $autorefresh_link_open_txt = ''; + $autorefresh_link_close = ''; } - $autorefresh_link_open_img = ''; - $autorefresh_link_open_txt = ''; - $autorefresh_link_close = ''; - $table->data[0][1] = $autorefresh_link_open_img . $autorefresh_img . $autorefresh_link_close; $table->data[0][2] = $autorefresh_link_open_txt . $autorefresh_txt . $autorefresh_link_close . $autorefresh_additional; //====================================================== diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 43f601e90b..fba2dbed7d 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -842,7 +842,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { echo ui_print_truncate_text($group['name']); echo ""; echo ""; - echo ""; + echo ""; if (check_acl ($config['id_user'], $id_group, "AW")) { echo '' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . ''; @@ -954,7 +954,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { } // Alerts fired if ($data["monitor_alerts_fired"] > 0) { - echo ""; + echo ""; echo ""; echo $data["monitor_alerts_fired"]; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 74a0a168aa..cba700e81f 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -304,6 +304,7 @@ div#foot { z-index: -999; background-image: url('../../images/login_background.jpg'); + background-color: #3f3f3f; background-size: cover; -moz-background-size: cover; -webkit-background-size: cover; @@ -1988,6 +1989,10 @@ div#pandora_logo_header { margin-top: 0px; } +.autorefresh_disabled { + cursor: not-allowed !important; +} + .disabled_module { color: #aaa; } @@ -2485,6 +2490,10 @@ span#plugin_description { border-spacing: 0px 4px; } +.groupsview tr { + background-color: #666; +} + .groupsview th { font-size: 12px; padding: 5px; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 177142c4ab..1a44f76895 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -221,36 +221,33 @@ if(enterprise_installed()) { if ($config['activate_gis'] || $agent['url_address'] != '') { $data = array(); - $col = 0; // Position Information if ($config['activate_gis']) { $dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']); - $data[$col] = '' . __('Position (Long, Lat)') . ''; - $col++; + $data[0] = '' . __('Position (Long, Lat)') . ''; if ($dataPositionAgent === false) { - $data[$col] = __('There is no GIS data.'); + $data[1] = __('There is no GIS data.'); } else { $data[$col] = ''; if ($dataPositionAgent['description'] != "") - $data[$col] .= $dataPositionAgent['description']; + $data[1] .= $dataPositionAgent['description']; else - $data[$col] .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude']; - $data[$col] .= ""; + $data[1] .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude']; + $data[1] .= ""; } - $col++; + $table_data->data[] = $data; } // If the url description is setted if ($agent['url_address'] != '') { - $data[$col] = '' . __('Url address') . ''; - $col++; - $data[$col] = '' . $agent["url_address"] . ''; + $data = array(); + $data[0] = '' . __('Url address') . ''; + $data[1] = '' . $agent["url_address"] . ''; + $table_data->data[] = $data; } - - $table_data->data[] = $data; } // Timezone Offset