2013-06-03 Sergio Martin <sergio.martin@artica.es>
* 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 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8247 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo
parent
1a7469b726
commit
d8b1f4fca5
|
|
@ -1,3 +1,14 @@
|
|||
2013-06-03 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* 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 <sergio.martin@artica.es>
|
||||
|
||||
* include/styles/pandora.css
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ if(tags_has_user_acl_tags()) {
|
|||
// Site news !
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
echo '<div style="width:50%; float:left; padding-right: 30px;" id="leftcolumn">';
|
||||
echo '<div style="width:50%; float:left;" id="leftcolumn">';
|
||||
//////////////////NEWS BOARD/////////////////////////////
|
||||
echo '<div id="news_board">';
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ echo '</div>';
|
|||
// ---------------------------------------------------------------------------
|
||||
// Site stats (global!)
|
||||
// ---------------------------------------------------------------------------
|
||||
echo '<div style="width:30%; float:left; padding-left: 30px;" id="rightcolumn">';
|
||||
echo '<div style="width:30%; float:left;" id="rightcolumn">';
|
||||
$data = reporting_get_group_stats ();
|
||||
|
||||
///////////////
|
||||
|
|
|
|||
|
|
@ -866,7 +866,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
|
|||
echo "<td class='group_view_data' style='text-align: center; vertica-align: middle;'>";
|
||||
if (check_acl ($config['id_user'], $id_group, "AW")) {
|
||||
echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' .
|
||||
html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>';
|
||||
html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force'))) . '</a>';
|
||||
}
|
||||
echo "</td>";
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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'));
|
||||
|
|
|
|||
|
|
@ -255,10 +255,8 @@ class Agents {
|
|||
$row[3] = $row[__('Group')] = ui_print_group_icon ($agent["id_grupo"], true);
|
||||
$row[4] = $row[__('Interval')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;"> ' . __('I.') . ' </span>' .
|
||||
'<span style="vertical-align: 0%;">' . human_time_description_raw($agent["intervalo"]) . '</span>';
|
||||
$row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' .
|
||||
agents_tree_view_status_img ($agent["critical_count"],
|
||||
$agent["warning_count"], $agent["unknown_count"],
|
||||
$agent["total_count"], $agent["notinit_count"]);
|
||||
$row[5] = $row[__('Status')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;">' . __('S.') . ' </span>' . agents_tree_view_status_img ($agent["critical_count"],
|
||||
$agent["warning_count"], $agent["unknown_count"]);
|
||||
$row[6] = $row[__('Alerts')] = '<span class="show_collapside" style="vertical-align: 10%; display: none; font-weight: bolder;"> ' . __('A.') . ' </span>' . agents_tree_view_alert_img ($agent["fired_count"]);
|
||||
|
||||
$row[7] = $row[__('Modules')] = '<span class="show_collapside" style="vertical-align: 0%; display: none; font-weight: bolder;"> ' . __('M.') . ' </span>' .
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ if (count($agents) > 0) {
|
|||
echo "<tr>";
|
||||
echo "<th style='width: 26px;'>" . __("Force") . "</th>";
|
||||
echo "<th style='width: 26px;'>" . __("Status") . "</th>";
|
||||
echo "<th width='25%'>" . __("Group") . "</th>";
|
||||
echo "<th width='30%'>" . __("Group") . "</th>";
|
||||
echo "<th width='10%'>" . __("Agents") . "</th>";
|
||||
echo "<th width='10%'>" . __("Agent unknown") . "</th>";
|
||||
echo "<th width='10%'>" . __("Unknown") . "</th>";
|
||||
|
|
@ -103,7 +103,7 @@ if (count($agents) > 0) {
|
|||
echo "<th width='10%'>" . __("Normal") . "</th>";
|
||||
echo "<th width='10%'>" . __("Warning") . "</th>";
|
||||
echo "<th width='10%'>" . __("Critical") . "</th>";
|
||||
echo "<th width='10%' style='min-width: 100px'>" . __("Alert fired") . "</th>";
|
||||
echo "<th width='10%'>" . __("Alert fired") . "</th>";
|
||||
|
||||
$printed_groups = array();
|
||||
|
||||
|
|
|
|||
|
|
@ -509,11 +509,7 @@ else {
|
|||
}
|
||||
|
||||
if (!empty($result)) {
|
||||
$graph = '<fieldset class="databox tactical_set" style="width:93%;">
|
||||
<legend>' .
|
||||
__('Events generated -by module-') .
|
||||
'</legend>' .
|
||||
grafico_eventos_grupo(350, 148, rawurlencode ($sql_post), $meta, $history) . '</fieldset>';
|
||||
$graph = '<div style="width: 350px; margin: 0 auto;">' . grafico_eventos_grupo(350, 148, rawurlencode ($sql_post), $meta, $history) . '</div>';
|
||||
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: '<?php echo __('Events generated -by agent-'); ?>',
|
||||
modal: true,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
},
|
||||
width: 450,
|
||||
height: 360
|
||||
height: 380
|
||||
})
|
||||
.show ();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue