2013-04-10 Sergio Martin <sergio.martin@artica.es>

* include/styles/pandora.css
	include/functions_graph.php
	include/functions_events.php
	include/functions_reporting.php
	operation/agentes/tactical.php
	images/header_help.png
	general/header.php: Adapt the screen to
	1024 resolutions reducing header and tactical
	view

	* images/tree.png: Add tree new icon



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7954 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-04-10 11:03:45 +00:00
parent 9c1dbf853d
commit 9b0c5c700c
9 changed files with 79 additions and 63 deletions

View File

@ -1,3 +1,17 @@
2013-04-10 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css
include/functions_graph.php
include/functions_events.php
include/functions_reporting.php
operation/agentes/tactical.php
images/header_help.png
general/header.php: Adapt the screen to
1024 resolutions reducing header and tactical
view
* images/tree.png: Add tree new icon
2013-04-10 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/groups.php: changed the call to get groups to

View File

@ -38,21 +38,21 @@ config_check();
echo html_print_image('images/pandora_header_logo.png', true, array("alt" => 'Pandora FMS Opensource', "border" => '0'));
}
else {
echo html_print_image('images/pandora_header_logo_enterprise.png', true, array("alt" => 'Pandora FMS Enterprise', "border" => '0'));
echo html_print_image('images/pandora_header_logo_enterprise.png', true, array("alt" => 'Pandora FMS Enterprise', "border" => '0', 'width' => '250px'));
}
?>
</a>
</td>
<td style="min-width:250px;">
<td style="min-width:120px;">
<?php
$table->class = "none";
$table->cellpadding = 0;
$table->cellspacing = 0;
$table->head = array ();
$table->data = array ();
$table->style[0] = $table->style[2] = $table->style[4] = 'width: 27px; text-align:center; height: 27px; padding-left: 12px; padding-right: 2px;';
$table->style[0] = $table->style[2] = $table->style[4] = 'width: 22px; text-align:center; height: 22px; padding-left: 12px; padding-right: 2px;';
$table->rowclass[0] = '';
$table->styleTable = 'margin: auto; margin-top: 20px;';
$table->styleTable = 'margin: auto; margin-top: 15px;';
// Servers check
$servers = array();
@ -76,7 +76,7 @@ config_check();
}
unset ($servers); // Since this is the header, we don't like to trickle down variables.
$servers_link_open = '<a class="white_bold" href="index.php?sec=gservers&amp;sec2=godmode/servers/modificar_server&amp;refr=60">';
$servers_link_open = '<a class="white" href="index.php?sec=gservers&amp;sec2=godmode/servers/modificar_server&amp;refr=60">';
$servers_link_close = '</a>';
$table->data[0][0] = $servers_link_open . $servers_check_img . $servers_link_close;
@ -122,15 +122,15 @@ config_check();
}
}
$autorefresh_link_open_img = '<a class="white_bold autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">';
$autorefresh_link_open_txt = '<a class="white_bold autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">';
$autorefresh_link_open_img = '<a class="white autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">';
$autorefresh_link_open_txt = '<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">';
$autorefresh_link_close = '</a>';
$table->data[0][2] = $autorefresh_link_open_img . $autorefresh_img . $autorefresh_link_close;
$table->data[0][3] = $autorefresh_link_open_txt . $autorefresh_txt . $autorefresh_link_close . $autorefresh_additional;
// Maintenance
$maintenance_txt = __('Maintenance');
//$maintenance_txt = __('Maintenance');
if ($config["alert_cnt"] > 0) {
echo '<div id="alert_messages" style="display: none"></div>';
@ -138,7 +138,7 @@ config_check();
$maintenance_link = 'javascript:';
$maintenance_title = __("System alerts detected - Please fix as soon as possible");
$maintenance_class = $maintenance_id = 'show_systemalert_dialog white_bold';
$maintenance_class = $maintenance_id = 'show_systemalert_dialog white';
$maintenance_link_open_txt = '<a href="' . $maintenance_link . '" title="' . $maintenance_title . '" class="' . $maintenance_class . '" id="show_systemalert_dialog">';
$maintenance_link_open_img = '<a href="' . $maintenance_link . '" title="' . $maintenance_title . '" class="' . $maintenance_class . '">';
@ -151,7 +151,7 @@ config_check();
}
$table->data[0][4] = $maintenance_img;
$table->data[0][5] = $maintenance_txt;
//$table->data[0][5] = $maintenance_txt;
html_print_table($table);
@ -165,50 +165,47 @@ config_check();
$table->cellspacing = 0;
$table->head = array ();
$table->data = array ();
$table->style[0] = $table->style[2] = 'width: 27px; text-align:center; height: 27px; padding-left: 12px; padding-right: 2px;';
$table->style[0] = $table->style[1] = 'width: 22px; text-align:center; height: 22px; padding-right: 2px;';
$table->rowclass[0] = '';
$table->styleTable = 'margin-top: 20px;';
$table->styleTable = 'margin-top: 15px;';
// Logout
$table->data[0][0] = '<a class="white" href="' . ui_get_full_url('index.php?bye=bye') . '">';
$table->data[0][0] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')));
$table->data[0][0] .= '</a>';
// User
if (is_user_admin ($config["id_user"]) == 1)
$table->data[0][0] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
$table->data[0][1] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
else
$table->data[0][0] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
$table->data[0][1] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user'));
$table->data[0][0] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit">' . $table->data[0][0] . '</a>';
$table->data[0][1] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit">' . $table->data[0][1] . '</a>';
$table->data[0][1] = '<a href="index.php?sec=workspace&amp;sec2=operation/users/user_edit" class="white"> [<b>' . $config["id_user"] . '</b>]</a>';
// Logout
$table->data[0][2] = '<a class="white_bold" href="' . ui_get_full_url('index.php?bye=bye') . '">';
$table->data[0][2] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')));
$table->data[0][2] .= '</a>';
$table->data[0][3] = '<a class="white_bold" href="' . ui_get_full_url('index.php?bye=bye') . '">';
$table->data[0][3] .= __('Logout');
$table->data[0][3] .= '</a>';
$table->data[0][2] = '<a href="index.php?sec=workspace&amp;sec2=operation/users/user_edit" class="white"> [<b>' . $config["id_user"] . '</b>]</a>';
html_print_table($table);
unset($table);
?>
</td>
<td style="min-width:240px;">
<td style="min-width:200px;">
<?php
$table->class = "none";
$table->cellpadding = 0;
$table->cellspacing = 0;
$table->head = array ();
$table->data = array ();
$table->style[0] = $table->style[1] = $table->style[2] = 'text-align:right; padding-right: 2px; width: 1px;';
$table->style[3] = 'width: 180px;';
$table->style[4] = 'padding-left: 10px; width: 20px;';
$table->style[0] = $table->style[1] = 'width: 22px; text-align:center; height: 22px; padding-right: 2px;';
$table->style[3] = $table->style[4] = $table->style[5] = 'text-align:right; padding-right: 2px; width: 1px;';
$table->style[6] = 'width: 120px;';
$table->style[7] = 'padding-left: 10px; padding-left: 10px; width: 20px;';
$table->width = "100%";
$table->styleTable = 'margin: auto; margin-top: 20px; padding-right: 5px;';
$table->styleTable = 'margin: auto; margin-top: 15px; padding-right: 5px;';
$table->rowclass[0] = '';
// Main help icon
$table->data[0][0] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png');
$table->data[0][3] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png');
// Messages
$msg_cnt = messages_get_count ($config["id_user"]);
@ -216,20 +213,20 @@ config_check();
echo '<div id="dialog_messages" style="display: none"></div>';
ui_require_css_file ('dialog');
$table->data[0][1] = '<a href="ajax.php?page=operation/messages/message_list" title="' . __("Message overview") . '" id="show_messages_dialog">';
$table->data[0][1] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;'));
$table->data[0][1] .= '</a>';
$table->data[0][4] = '<a href="ajax.php?page=operation/messages/message_list" title="' . __("Message overview") . '" id="show_messages_dialog">';
$table->data[0][4] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;'));
$table->data[0][4] .= '</a>';
}
else {
$table->data[0][1] = '';
$table->data[0][4] = '';
}
// Chat messages
$table->data[0][2] = "<span id='icon_new_messages_chat' style='display: none;'>";
$table->data[0][2] .= "<a href='index.php?sec=workspace&sec2=operation/users/webchat'>";
$table->data[0][2] .= html_print_image('images/header_chat.png', true, array('style' => 'width:22px;', "title" => __('New chat message')));
$table->data[0][2] .= "</a>";
$table->data[0][2] .= "</span>";
$table->data[0][5] = "<span id='icon_new_messages_chat' style='display: none;'>";
$table->data[0][5] .= "<a href='index.php?sec=workspace&sec2=operation/users/webchat'>";
$table->data[0][5] .= html_print_image('images/header_chat.png', true, array('style' => 'width:22px;', "title" => __('New chat message')));
$table->data[0][5] .= "</a>";
$table->data[0][5] .= "</span>";
// Search bar
$search_bar = '<form method="get" style="display: inline;" name="quicksearch" action="">';
@ -250,9 +247,9 @@ config_check();
$search_bar .= "<input type='hidden' name='head_search_keywords' value='abc' />";
$search_bar .= '</form>';
$table->data[0][3] = $search_bar;
$table->data[0][6] = $search_bar;
$table->data[0][4] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true);
$table->data[0][7] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true);
html_print_table($table);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 963 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -907,34 +907,33 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$out .= $events_table;
if($agent_id != 0) {
$out .= '</td><td style="width: 250px; vertical-align: top;">';
$out .= '</td><td style="width: 200px; vertical-align: top;">';
$out .= '<table cellpadding=0 cellspacing=0 class="databox"><tr><td>';
$out .= '<fieldset class="databox tactical_set" style="width:93%;">
<legend>' .
__('Events generated -by module-') .
'</legend>' .
graph_event_module (250, 100, $event['id_agente']) . '</fieldset>';
graph_event_module (180, 100, $event['id_agente']) . '</fieldset>';
$out .= '</td></tr></table>';
}
else {
$out .= '</td><td style="width: 250px; vertical-align: top;">';
$out .= '</td><td style="width: 200px; vertical-align: top;">';
$out .= '<table cellpadding=0 cellspacing=0 class="databox"><tr><td>';
$out .= '<fieldset class="databox tactical_set" style="width:93%;">
<legend>' .
__('Event graph') .
'</legend>' .
grafico_eventos_total("", 250, 100) . '</fieldset>';
grafico_eventos_total("", 180, 60) . '</fieldset>';
$out .= '<fieldset class="databox tactical_set" style="width:93%;">
<legend>' .
__('Event graph by agent') .
'</legend>' .
grafico_eventos_grupo(250, 100) . '</fieldset>';
grafico_eventos_grupo(180, 60) . '</fieldset>';
$out .= '</td></tr></table>';
}
$out .= '</td></tr></table>';
unset ($table);
if($return) {

View File

@ -2068,7 +2068,7 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
break;
}
$result = db_get_all_rows_sql ($sql);
$result = db_get_all_rows_sql ($sql, false, false);
if ($result === false) {
$result = array();
}
@ -2120,7 +2120,7 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark,
$config['fontpath'], $config['font_size'], 1);
$config['fontpath'], $config['font_size'], 1, 'bottom');
}
/**
@ -2144,7 +2144,7 @@ function grafico_eventos_total($filter = "", $width = 320, $height = 200) {
$sql = "SELECT criticity, COUNT(id_evento) events FROM tevento GROUP BY criticity ORDER BY events DESC";
$criticities = db_get_all_rows_sql ($sql);
$criticities = db_get_all_rows_sql ($sql, false, false);
if(empty($criticities)) {
$criticities = array();
@ -2190,7 +2190,7 @@ function grafico_eventos_total($filter = "", $width = 320, $height = 200) {
return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark,
$config['fontpath'], $config['font_size'], 1, false, $colors);
$config['fontpath'], $config['font_size'], 1, 'bottom', $colors);
}
/**

View File

@ -891,7 +891,7 @@ function reporting_get_stats_servers($tiny = true) {
$table_srv->data[] = $tdata;
$tdata = array();
$tdata[0] = html_print_image('images/database25.png', true, array('title' => __('Local modules'), 'width' => '25px'));
$tdata[0] = html_print_image('images/database.png', true, array('title' => __('Local modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_local_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["local_modules_rate"], 2) . '</span>';
@ -902,7 +902,7 @@ function reporting_get_stats_servers($tiny = true) {
if ($tiny) {
$tdata = array();
$tdata[0] = html_print_image('images/network25.png', true, array('title' => __('Remote modules'), 'width' => '25px'));
$tdata[0] = html_print_image('images/network.png', true, array('title' => __('Remote modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_remote_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["remote_modules_rate"], 2) . '</span>';
@ -914,7 +914,7 @@ function reporting_get_stats_servers($tiny = true) {
else {
if (isset($server_performance ["total_network_modules"])) {
$tdata = array();
$tdata[0] = html_print_image('images/network25.png', true, array('title' => __('Network modules'), 'width' => '25px'));
$tdata[0] = html_print_image('images/network.png', true, array('title' => __('Network modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_network_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["network_modules_rate"], 2) . '</span>';
@ -938,7 +938,7 @@ function reporting_get_stats_servers($tiny = true) {
if (isset($server_performance ["total_prediction_modules"])) {
$tdata = array();
$tdata[0] = html_print_image('images/bars25.png', true, array('title' => __('Prediction modules'), 'width' => '25px'));
$tdata[0] = html_print_image('images/chart_bar.png', true, array('title' => __('Prediction modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_prediction_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["prediction_modules_rate"], 2) . '</span>';
@ -950,7 +950,7 @@ function reporting_get_stats_servers($tiny = true) {
if (isset($server_performance ["total_wmi_modules"])) {
$tdata = array();
$tdata[0] = html_print_image('images/wmi25.png', true, array('title' => __('WMI modules'), 'width' => '25px'));
$tdata[0] = html_print_image('images/wmi.png', true, array('title' => __('WMI modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_wmi_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["wmi_modules_rate"], 2) . '</span>';
@ -962,7 +962,7 @@ function reporting_get_stats_servers($tiny = true) {
if (isset($server_performance ["total_web_modules"])) {
$tdata = array();
$tdata[0] = html_print_image('images/web25.png', true, array('title' => __('Web modules'), 'width' => '25px'));
$tdata[0] = html_print_image('images/world.png', true, array('title' => __('Web modules'), 'width' => '25px'));
$tdata[1] = '<span class="big_data">' . format_numeric($server_performance ["total_web_modules"]) . '</span>';
$tdata[2] = '<span class="med_data">' . format_numeric($server_performance ["web_modules_rate"], 2) . '</span>';

View File

@ -42,7 +42,7 @@ div#page {
#login_body {
/* Set rules to fill background */
min-height: 100%;
min-width: 1024px;
min-width: 960px;
/* Set up proportionate scaling */
width: 100%;
@ -1698,10 +1698,16 @@ div#head {
height: auto;
background-color: #000;
background-image: url(../../images/header_blackout.png);
height: 78px;
height: 68px;
min-width: 882px;
color: white;
}
div#head .bot{
width: 20px;
}
div#foot {
width: auto;
}

View File

@ -56,7 +56,7 @@ if(tags_has_user_acl_tags()) {
}
echo '<table border=0 style="width:100%;"><tr>';
echo '<td style="vertical-align: top; min-width: 265px; width:25%; padding-right: 20px;" id="leftcolumn">';
echo '<td style="vertical-align: top; min-width: 180px; width:25%; padding-right: 10px;" id="leftcolumn">';
// ---------------------------------------------------------------------
// The status horizontal bars (Global health, Monitor sanity...
// ---------------------------------------------------------------------
@ -69,7 +69,7 @@ $table->head = array ();
$table->data = array ();
$table->style = array ();
$table->data[0][0] = reporting_get_stats_indicators($data, 180, 20);
$table->data[0][0] = reporting_get_stats_indicators($data, 120, 20);
$table->rowclass[] = '';
@ -89,7 +89,7 @@ $table->data = array ();
$table->style = array ();
$table->data[0][0] = reporting_get_stats_alerts($data);
$table->data[0][0] .= reporting_get_stats_modules_status($data, 200, 100);
$table->data[0][0] .= reporting_get_stats_modules_status($data, 180, 100);
$table->data[0][0] .= reporting_get_stats_agents_monitors($data);
$table->rowclass[] = '';