diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ddac6b304b..9379083b2b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-06-03 Sergio Martin + + * include/styles/pandora.css + include/functions_groups.php + operation/events/events_list.php + operation/agentes/group_view.php + mobile/operation/agent.php + mobile/operation/agents.php + mobile/include/style/main.css + general/logon_ok.php: Few visual fixes + 2013-06-03 Sergio Martin * include/styles/pandora.css diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 7f57913fe8..ea77dfdcb3 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -37,7 +37,7 @@ if(tags_has_user_acl_tags()) { // Site news ! // --------------------------------------------------------------------------- -echo '
'; +echo '
'; //////////////////NEWS BOARD///////////////////////////// echo '
'; @@ -164,7 +164,7 @@ echo '
'; // --------------------------------------------------------------------------- // Site stats (global!) // --------------------------------------------------------------------------- -echo '
'; +echo '
'; $data = reporting_get_group_stats (); /////////////// diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 1bbc75dd61..a714f8ddfd 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -866,7 +866,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { echo ""; if (check_acl ($config['id_user'], $id_group, "AW")) { echo '' . - html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . ''; + html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force'))) . ''; } echo ""; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 5590a5b973..ec34781e9c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1288,6 +1288,7 @@ div.title_line { background: #ababab url('../../images/tab_grey_bg.png'); padding-left: 3px; padding-right: 3px; + min-height: 23px; } #menu_tab li.tab_godmode.nomn_high a, #menu_tab a.tab_godmode.nomn_high, @@ -1300,6 +1301,7 @@ div.title_line { background: #6ba532 url('../../images/tab_green_bg.png'); padding-left: 3px; padding-right: 3px; + min-height: 23px; } #menu_tab li.tab_operation.nomn_high a, #menu_tab a.tab_operation.nomn_high, diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 1c77801da2..56bb1afec5 100644 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -537,7 +537,7 @@ table#list_events th { #list_Modules .cell_5 a { color: #000000 !important; } -/* + @media screen and (max-width: 35em) { #list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_6 .ui-table-cell-label { @@ -558,7 +558,7 @@ table#list_events th { #list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_3 .ui-table-cell-label, #list_Modules_Embedded .cell_4 .ui-table-cell-label { - display: none !important; + display: none; } #list_Modules_Embedded .show_collapside { @@ -569,11 +569,10 @@ table#list_events th { white-space: nowrap; } - #list_Modules_Embedded .cell_2, - #list_Modules_Embedded .cell_1 { + #list_Modules_Embedded .cell_2 { display: none !important; } -}*/ +} #list_Modules_Embedded .cell_4 a { color: #000000 !important; diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php index 8a721e9777..a3a3b47e01 100644 --- a/pandora_console/mobile/operation/agent.php +++ b/pandora_console/mobile/operation/agent.php @@ -130,8 +130,7 @@ class Agent { $modules = new Modules(); - $filters = array('id_agent' => $this->id, - 'all_modules' => true, 'status' => -1); + $filters = array('id_agent' => $this->id, 'all_modules' => true, 'status' => -1); $modules->setFilters($filters); $modules->disabledColumns(array('agent')); $ui->contentBeginCollapsible(__('Modules')); diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php index ad0856af6b..57f6f4efd0 100644 --- a/pandora_console/mobile/operation/agents.php +++ b/pandora_console/mobile/operation/agents.php @@ -255,10 +255,8 @@ class Agents { $row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true); $row[4] = $row[__('Interval')] = '' . '' . human_time_description_raw($agent["intervalo"]) . ''; - $row[5] = $row[__('Status')] = '' . - agents_tree_view_status_img ($agent["critical_count"], - $agent["warning_count"], $agent["unknown_count"], - $agent["total_count"], $agent["notinit_count"]); + $row[5] = $row[__('Status')] = '' . agents_tree_view_status_img ($agent["critical_count"], + $agent["warning_count"], $agent["unknown_count"]); $row[6] = $row[__('Alerts')] = '' . agents_tree_view_alert_img ($agent["fired_count"]); $row[7] = $row[__('Modules')] = '' . diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index 79f50a2498..e31e3b688f 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -95,7 +95,7 @@ if (count($agents) > 0) { echo ""; echo "" . __("Force") . ""; echo "" . __("Status") . ""; - echo "" . __("Group") . ""; + echo "" . __("Group") . ""; echo "" . __("Agents") . ""; echo "" . __("Agent unknown") . ""; echo "" . __("Unknown") . ""; @@ -103,7 +103,7 @@ if (count($agents) > 0) { echo "" . __("Normal") . ""; echo "" . __("Warning") . ""; echo "" . __("Critical") . ""; - echo "" . __("Alert fired") . ""; + echo "" . __("Alert fired") . ""; $printed_groups = array(); diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 64273f6eee..4fe8c9c881 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -509,11 +509,7 @@ else { } if (!empty($result)) { - $graph = '
- ' . - __('Events generated -by module-') . - '' . - grafico_eventos_grupo(350, 148, rawurlencode ($sql_post), $meta, $history) . '
'; + $graph = '
' . grafico_eventos_grupo(350, 148, rawurlencode ($sql_post), $meta, $history) . '
'; html_print_div(array('id' => 'events_graph', 'hidden' => true, 'content' => $graph)); } @@ -1125,13 +1121,14 @@ function show_events_graph_dialog() { .dialog ({ resizable: true, draggable: true, + title: '', modal: true, overlay: { opacity: 0.5, background: "black" }, width: 450, - height: 360 + height: 380 }) .show (); }