Changes some bad colors and others aesthetic changes. Thanks Carla.

2014-09-04  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/extensions/module_groups.php,
	pandora_console/general/login_help_dialog.php,
	pandora_console/images/close_button_dialog.png,
	pandora_console/images/documentation.png,
	pandora_console/images/enterprise_version.png,
	pandora_console/images/error_login.png,
	pandora_console/images/online_help.png,
	pandora_console/images/support.png,
	pandora_console/include/ajax/events.php,
	pandora_console/include/constants.php,
	pandora_console/include/functions_events.php,
	pandora_console/include/javascript/pandora_events.js,
	pandora_console/include/styles/jquery-ui-1.10.0.custom.css,
	pandora_console/include/styles/pandora.css,
	pandora_console/mobile/include/style/main.css,
	pandora_console/operation/events/events_list.php: changes some
	bad colors and others aesthetic changes. Thanks Carla.
This commit is contained in:
mdtrooper 2014-09-04 12:19:55 +02:00
parent f9c1d822cc
commit 810754d310
16 changed files with 139 additions and 85 deletions

View File

@ -167,7 +167,9 @@ function mainModuleGroups() {
ui_print_page_header (__("Combined table of agent group and module group"), "images/module_group.png", false, "", false, '');
echo "<p>" . __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") . "</p>";
echo "<p>" .
__("This table shows in columns the modules group and in rows agents group. The cell shows all modules") .
"</p>";
$agentGroups = users_get_groups ($config['id_user'], "AR", false);
@ -187,7 +189,7 @@ function mainModuleGroups() {
$table = null;
$table->align[0] = 'right'; //Align to right the first column.
$table->style[0] = 'color: #ffffff; '.
'background-color: #778866; font-weight: bolder;';
'background-color: #373737; font-weight: bolder; padding-right: 10px;';
$table->head = $head;
$table->width = '98%';

View File

@ -38,53 +38,49 @@ if (is_ajax()) {
echo '<div id="login_help_dialog" title="' .
__('Welcome to Pandora FMS') . '" style="">';
echo '<div style="position:absolute; top:30px; left: 10px; text-align: left; right:0%; height:70px; width:560px; margin: 0 auto; border: 1px solid #FFF; line-height: 19px;">';
echo '<span style="font-size: 15px;">' .
__('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora!') . '</span>';
echo '<div style="font-size: 10pt; margin: 20px;">';
echo __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora FMS!');
echo '</div>';
echo '<div style="position:absolute; top:110px; text-align: center; left:0%; right:0%; height:210px; width:580px; margin: 0 auto; border: 1px solid #FFF">';
echo '<div style="">';
echo '<table cellspacing=0 cellpadding=0 style="border:1px solid #FFF; width:100%; height: 100%">';
echo '<tr>';
echo '<td style="border:1px solid #FFF; width:50%; height: 50%;">';
echo '<div style="position: relative; float: left; width:40%;">';
echo '<a href="' . ui_get_full_url(false) . 'general/pandora_help.php?id=main_help" target="_blank" style="text-decoration:none;">' . html_print_image('images/online_help.png', true, array("alt" => __('Online help'), "border" => 0)) . '</a>';
echo '</div>';
echo '<div style="position:relative; margin: 0 auto; float: right; width:60%; height: 60px; top: 20px; text-align: left;">';
echo '<a href="' . ui_get_full_url(false) . 'general/pandora_help.php?id=main_help" target="_blank" style="text-decoration:none; text-shadow: 0 2px 2px #9D9999;" onmouseover="this.style.textDecoration=\'underline\';" onmouseout="this.style.textDecoration=\'none\';"><span style="font-size: 14px;">' . __('Online help') . '</span></a>';
echo '</div>';
echo '<td style="border:1px solid #FFF;">';
echo '<a href="' . ui_get_full_url(false) . 'general/pandora_help.php?id=main_help" target="_blank" style="text-decoration:none;">' .
html_print_image('images/online_help.png', true,
array("alt" => __('Online help'), "border" => 0)) . '</a>';
echo '<br style="margin-bottom: 40px;" />';
echo '<a style="font-size: 9pt;" href="' . ui_get_full_url(false) . 'general/pandora_help.php?id=main_help" target="_blank">' . __('Online help') . '</a>';
echo '</td>';
echo '<td style="border:1px solid #FFF;">';
echo '<a href="http://pandorafms.com/" target="_blank" style="text-decoration:none;">' .
html_print_image('images/enterprise_version.png', true,
array("alt" => __('Enterprise version'), "border" => 0)) . '</a>';
echo '<br style="margin-bottom: 40px;" />';
echo '<a style="font-size: 9pt;" href="http://pandorafms.com/" target="_blank">' . __('Enterprise version') . '</a>';
echo '</td>';
echo '<td style="border:1px solid #FFF">';
echo '<div style="position: relative; float: left; width:40%;">';
echo '<a href="http://openideas.info/smf/" target="_blank" style="text-decoration:none;">' . html_print_image('images/support.png', true, array("alt" => __('Support'), "border" => 0)) . '</a>';
echo '</div>';
echo '<div style="position:relative; margin: 0 auto; float: right; width:60%; height: 60px; top: 20px; text-align: left;">';
echo '<a href="http://openideas.info/smf/" target="_blank" style="text-decoration:none; text-shadow: 0 2px 2px #9D9999;" onmouseover="this.style.textDecoration=\'underline\';" onmouseout="this.style.textDecoration=\'none\';"><span style="font-size: 14px;">' . __('Support') . ' / ' . __('Forums') . '</span></a>';
echo '</div>';
echo '</td>';
echo '</tr>';
echo '<tr>';
echo '<td style="border:1px solid #FFF; width:50%; height: 50%">';
echo '<div style="position: relative; float: left; width:40%;">';
echo '<a href="http://pandorafms.com/" target="_blank" style="text-decoration:none;">' . html_print_image('images/enterprise_version.png', true, array("alt" => __('Enterprise version'), "border" => 0)) . '</a>';
echo '</div>';
echo '<div style="position:relative; margin: 0 auto; float: right; width:60%; height: 60px; top: 20px; text-align: left;">';
echo '<a href="http://pandorafms.com/" target="_blank" style="text-decoration:none; text-shadow: 0 2px 2px #9D9999;" onmouseover="this.style.textDecoration=\'underline\';" onmouseout="this.style.textDecoration=\'none\';"><span style="font-size: 14px;">' . __('Enterprise version') . '</span></a>';
echo '</div>';
echo '<a href="http://openideas.info/smf/" target="_blank" style="text-decoration:none;">' .
html_print_image('images/support.png', true,
array("alt" => __('Support'), "border" => 0)) . '</a>';
echo '<br style="margin-bottom: 40px;" />';
echo '<a style="font-size: 9pt;" href="http://openideas.info/smf/" target="_blank">' . __('Support') . ' / ' . __('Forums') . '</a>';
echo '</td>';
echo '<td style="border:1px solid #FFF">';
echo '<div style="position: relative; float: left; width:40%;">';
echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none;">' . html_print_image('images/documentation.png', true, array("alt" => __('Documentation'), "border" => 0)) . '</a>';
echo '</div>';
echo '<div style="position:relative; margin: 0 auto; float: right; width:60%; height: 60px; top: 20px; text-align: left;">';
echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none; text-shadow: 0 2px 2px #9D9999;" onmouseover="this.style.textDecoration=\'underline\';" onmouseout="this.style.textDecoration=\'none\';"><span style="font-size: 14px;">' . __('Documentation') . '</span></a>';
echo '</div>';
echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none;">' .
html_print_image('images/documentation.png', true,
array("alt" => __('Documentation'), "border" => 0)) . '</a>';
echo '<br style="margin-bottom: 40px;" />';
echo '<a style="font-size: 9pt;" href="http://pandorafms.com/pandora/doc/en" target="_blank">' . __('Documentation') . '</span></a>';
echo '</td>';
echo '</tr>';
echo '</table>';
echo '</div>';
echo '<div style="position:absolute; margin: 0 auto; top: 340px; right: 10px; border: 1px solid #FFF; width: 570px">';
echo '<div style="position:absolute; margin: 0 auto; top: 240px; right: 10px; border: 1px solid #FFF; width: 570px">';
echo '<div style="float: left; margin-top: 3px; margin-left: 0px; width: 80%; text-align: left;">';
html_print_checkbox('skip_login_help', 1, false, false, false, 'cursor: \'pointer\'');
echo '&nbsp;<span style="font-size: 12px;">' .__("Click here to don't show again this message") . '</span>';
@ -106,7 +102,7 @@ $(document).ready (function () {
resizable: true,
draggable: true,
modal: true,
height: 450,
height: 350,
width: 630,
overlay: {
opacity: 0.5,

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -290,7 +290,7 @@ if ($get_extended_event) {
}
// Tabs
$tabs = "<ul style='background:#eeeeee;border:0px'>";
$tabs = "<ul style='background:#ffffff !important; border-top: 0px; border-left: 0px; border-right: 0px; border-top-left-radius: 0px; border-top-right-radius: 0px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color: #D3D3D3;'>";
$tabs .= "<li><a href='#extended_event_general_page' id='link_general'>".html_print_image('images/lightning_go.png',true).__('General')."</a></li>";
$tabs .= "<li><a href='#extended_event_details_page' id='link_details'>".html_print_image('images/zoom.png',true).__('Details')."</a></li>";
$tabs .= "<li><a href='#extended_event_custom_fields_page' id='link_custom_fields'>".html_print_image('images/custom_field_col.png',true).__('Agent fields')."</a></li>";
@ -349,13 +349,13 @@ if ($get_extended_event) {
}
$details = events_page_details($event, $server);
// Juanma (09/05/2014) Fix: Needs to reconnect to node, in previous funct node connection was lost
if ($meta) {
$server = metaconsole_get_connection_by_id ($server_id);
metaconsole_connect($server);
metaconsole_connect($server);
}
$custom_fields = events_page_custom_fields($event);
$custom_data = events_page_custom_data($event);
@ -434,8 +434,8 @@ if ($get_events_details) {
$out = '<table class="eventtable" style="width:100%;height:100%;padding:0px 0px 0px 0px; border-spacing: 0px; margin: 0px 0px 0px 0px;">';
$out .= '<tr style="font-size:0px; heigth: 0px; background: #ccc;"><td></td><td></td></tr>';
foreach($events as $event) {
switch($event["estado"]) {
foreach ($events as $event) {
switch ($event["estado"]) {
case 0:
$img = ui_get_full_url("images/star.png", false, false, false);
$title = __('New event');

View File

@ -119,8 +119,8 @@ switch ($config["dbtype"]) {
/* Color constants */
define('COL_CRITICAL','#FF4040');
define('COL_WARNING','#F2D400');
define('COL_CRITICAL','#f85858');
define('COL_WARNING','#ffea59');
define('COL_WARNING_DARK','#FFB900');
define('COL_NORMAL','#6EB432');
define('COL_NOTINIT','#3BA0FF');

View File

@ -1521,12 +1521,14 @@ function events_page_responses ($event) {
// Responses
/////////
$table_responses->cellspacing = 2;
$table_responses->cellpadding = 2;
$table_responses->id = 'responses_table';
$table_responses->width = '100%';
$table_responses->data = array ();
$table_responses->head = array ();
$table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left;';
$table_responses->style[1] = 'text-align: left;';
$table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
$table_responses->style[1] = 'text-align: left; height: 23px; text-align: right;';
$table_responses->class = "alternate rounded_cells";
if (tags_check_acl ($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags'])) {
@ -1541,7 +1543,7 @@ function events_page_responses ($event) {
// Juanma (05/05/2014) Fix : Propagate ACL hell!
$_user_groups = array_keys(users_get_groups($config['id_user'], 'ER', users_can_manage_group_all()));
$users = groups_get_users($_user_groups, array('id_perfil' => $profiles_view_events), true, true);
foreach($users as $u) {
$owners[$u['id_user']] = $u['fullname'];
}
@ -1586,9 +1588,9 @@ function events_page_responses ($event) {
$status = array(1 => __('Validated'));
break;
}
}
// The change status option will be enabled only when is possible change the status
$data[1] = html_print_select($status, 'estado', $event['estado'], '', '', 0, true, false, false, '', $status_blocked);
@ -1621,22 +1623,24 @@ function events_page_responses ($event) {
// Custom responses
$data = array();
$data[0] = __('Custom responses');
$id_groups = array_keys(users_get_groups(false, "EW"));
$event_responses = db_get_all_rows_filter('tevent_response',
array('id_group' => $id_groups));
if(empty($event_responses)) {
if (empty($event_responses)) {
$data[1] = '<i>'.__('N/A').'</i>';
}
else {
$responses = array();
foreach($event_responses as $v) {
foreach ($event_responses as $v) {
$responses[$v['id']] = $v['name'];
}
$data[1] = html_print_select($responses,'select_custom_response','','','','',true, false, false);
$data[1] = html_print_select(
$responses,
'select_custom_response','','','','',true, false, false);
if(isset($event['server_id'])) {
if (isset($event['server_id'])) {
$server_id = $event['server_id'];
}
else {
@ -1648,6 +1652,7 @@ function events_page_responses ($event) {
$table_responses->data[] = $data;
$responses_js = "<script>
$('#select_custom_response').change(function() {
var id_response = $('#select_custom_response').val();
@ -1655,22 +1660,27 @@ function events_page_responses ($event) {
var description = get_response_description(id_response);
$('.params_rows').remove();
$('#responses_table').append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px;\">".__('Description')."</td><td style=\"text-align:left;\">'+description+'</td></tr>');
$('#responses_table')
.append('<tr class=\"params_rows\"><td style=\"text-align:left; font-weight: bolder;\">".__('Description')."</td><td style=\"text-align:left;\">'+description+'</td></tr>');
if(params.length == 1 && params[0] == '') {
if (params.length == 1 && params[0] == '') {
return;
}
$('#responses_table').append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px;\" colspan=\"2\">".__('Parameters')."</td></tr>');
$('#responses_table')
.append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px;\" colspan=\"2\">".__('Parameters')."</td></tr>');
for(i=0;i<params.length;i++) {
for (i = 0; i < params.length; i++) {
add_row_param('responses_table',params[i]);
}
});
$('#select_custom_response').trigger('change');
</script>";
$responses = '<div id="extended_event_responses_page" class="extended_event_pages">'.html_print_table($table_responses, true).$responses_js.'</div>';
$responses = '<div id="extended_event_responses_page" class="extended_event_pages">' .
html_print_table($table_responses, true) .
$responses_js .
'</div>';
return $responses;
}
@ -1733,11 +1743,13 @@ function events_page_custom_fields ($event) {
// Custom fields
////////////////////////////////////////////////////////////////////
$table->cellspacing = 2;
$table->cellpadding = 2;
$table->width = '100%';
$table->data = array ();
$table->head = array ();
$table->style[0] = 'width:35%; font-weight: bold; text-align: left;';
$table->style[1] = 'text-align: left;';
$table->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
$table->style[1] = 'text-align: left; height: 23px;';
$table->class = "alternate rounded_cells";
$all_customs_fields = (bool)check_acl($config["id_user"],
@ -1804,8 +1816,10 @@ function events_page_details ($event, $server = "") {
$table_details->width = '100%';
$table_details->data = array ();
$table_details->head = array ();
$table_details->style[0] = 'width:35%; font-weight: bold; text-align: left;';
$table_details->style[1] = 'text-align: left;';
$table_details->cellspacing = 2;
$table_details->cellpadding = 2;
$table_details->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
$table_details->style[1] = 'text-align: left; height: 23px;';
$table_details->class = "alternate rounded_cells";
switch ($event['event_type']) {
@ -2093,12 +2107,13 @@ function events_page_general ($event) {
////////////////////////////////////////////////////////////////////
// General
////////////////////////////////////////////////////////////////////
$table_general->cellspacing = 2;
$table_general->cellpadding = 2;
$table_general->width = '100%';
$table_general->data = array ();
$table_general->head = array ();
$table_general->style[0] = 'width:35%; font-weight: bold; text-align: left;';
$table_general->style[1] = 'text-align: left;';
$table_general->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
$table_general->style[1] = 'text-align: left; height: 23px;';
$table_general->class = "alternate rounded_cells";
$data = array();
@ -2234,7 +2249,9 @@ function events_page_general ($event) {
}
$table_general->data[] = $data;
$general = '<div id="extended_event_general_page" class="extended_event_pages">'.html_print_table($table_general,true).'</div>';
$general = '<div id="extended_event_general_page" class="extended_event_pages">' .
html_print_table($table_general,true) .
'</div>';
return $general;
}

View File

@ -47,7 +47,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) {
background: "black"
},
width: 725,
height: 510
height: 530
})
.show ();
@ -71,7 +71,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) {
$('#notification_owner_error').show();
break;
}
forced_title_callback();
},
"html"

View File

@ -406,6 +406,9 @@ button.ui-button::-moz-focus-inner {
}
.ui-dialog .ui-dialog-titlebar {
padding: .4em 1em;
padding-top: 5px;
padding-bottom: 5px;
margin: 3px;
position: relative;
}
.ui-dialog .ui-dialog-title {
@ -1194,7 +1197,7 @@ body .ui-tooltip {
}
.ui-dialog .ui-widget-header {
background-color: transparent !important;
background-color: #82b92e !important;
}
.ui_tpicker_hour,
@ -1221,3 +1224,39 @@ body .ui-tooltip {
.ui-icon {
}
/*
* Pandora Styles
*/
.ui-dialog .ui-widget-content {
border: 0px;
}
.ui-dialog {
border: 0px;
}
.ui-dialog-titlebar {
border: 0px;
}
.ui-dialog-titlebar .ui-icon-closethick,
.ui-dialog-titlebar .ui-state-default,
.ui-dialog-titlebar .ui-state-hover,
.ui-dialog-titlebar button {
background: transparent;
border: 0px;
}
.ui-dialog-titlebar .ui-icon-closethick {
background-image: url("../../images/close_button_dialog.png");
width: 14px;
height: 13px;
margin-top: -5px;
}
.ui-dialog-title {
color: #ffffff;
font-size: 9pt;
}

View File

@ -924,7 +924,7 @@ tr.disabled_row_user * {
}
.error *{
color: #FF4040;
color: #f85858;
}
.help {
@ -2005,14 +2005,14 @@ div.cellNormal {
div.cellCritical {
width: 100%;
height: 100%;
background: #FF4040;
background: #f85858;
color: #fff;
}
div.cellWarning {
width: 100%;
height: 100%;
background: #F2D400;
background: #ffea59;
color: #111;
}
@ -2085,7 +2085,7 @@ tr.group_view_data, .group_view_data {
}
tr.group_view_crit, .group_view_crit {
background-color: #FF4040;
background-color: #f85858;
color: #fff;
}
@ -2098,7 +2098,7 @@ tr.group_view_ok, .group_view_ok {
}
tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, tr.a.group_view_warn {
background-color: #F2D400;
background-color: #ffea59;
color: #3F3F3F !important;
}
@ -2122,12 +2122,12 @@ tr.group_view_unk, .group_view_unk {
color: #fff;
}
.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a, .datos_red *{
background-color: #FF4040;
background-color: #f85858;
color: #fff !important;
}
.datos_yellow, .datos_yellowf9, .datos_yellow * {
background-color: #F2D400;
background-color: #ffea59;
color: #111;
}
@ -2142,7 +2142,7 @@ a.datos_blue, .datos_bluef9, .datos_blue, .datos_blue * {
}
.datos_pink, .datos_pinkf9, .datos_pink * {
background-color: #F099A2;
background-color: #fdc4ca;
color: #111;
}

View File

@ -96,7 +96,7 @@ tr.group_view_crit, .group_view_crit {
color: #000000 !important;
}
.ui-btn-up-group_view_crit, .ui-btn-hover-group_view_crit {
background-color: #FF4040;
background-color: #f85858;
color: #fff;
border: 1px solid #111111;
font-weight: bold;
@ -146,7 +146,7 @@ a.group_view_warn {
color: #000000 !important;
}
.ui-btn-up-group_view_warn, .ui-btn-hover-group_view_warn {
background-color: #F2D400;
background-color: #ffea59;
color: #111;
border: 1px solid #111111;
font-weight: bold;
@ -483,7 +483,7 @@ table.event_details td.cell_event_name {
/*INIT-----------Agents styles----------------------------------------*/
.red, .redb, .redi, .error {
background: #FF4040 !important;
background: #f85858 !important;
}
.green {
@ -495,7 +495,7 @@ table.event_details td.cell_event_name {
}
.yellow {
background: #F2D400 !important;
background: #ffea59 !important;
}
.grey {

View File

@ -567,7 +567,7 @@ else {
if (!empty($result)) {
$graph = '<div style="width: 350px; margin: 0 auto;">' .
grafico_eventos_grupo(350, 148,
grafico_eventos_grupo(400, 250,
rawurlencode ($sql_post), $meta, $history) .
'</div>';
html_print_div(array('id' => 'events_graph',