tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

15-Improve_visual_console_2

This commit is contained in:
enriquecd 2017-01-17 12:47:03 +01:00
parent 1f07d8a022
commit 774d6bf231
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/graphs/flot/jquery.flot.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
pandora_console/include/graphs/functions_flot.php
View File

@ -431,6 +431,22 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
$force_integer = 'false';
}
//modify internal grid lines and legend text color
if(substr($background_style, -6, 4) == '#fff'){
$background_color = "#eee";
$legend_color = "#151515";
}
else if(substr($background_style, -6, 4) == '#000'){
$background_color = "#151515";
$legend_color = "#BDBDBD";
}
else{
$background_color = "#A4A4A4";
$legend_color = "#A4A4A4";
}
// Trick to get translated string from javascript
$return .= html_print_input_hidden('unknown_text', __('Unknown'),
true);
@ -473,7 +489,13 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
"'$series_suffix_str',
" . json_encode($dashboard) . ",\n
" . json_encode($vconsole) . ",\n" .
"'$xaxisname');";
"'$xaxisname', \n" .
"'$background_color', \n" .
"'$legend_color'
);";
$return .= "\n//]]>";
$return .= "</script>";

6
pandora_console/include/javascript/tiny_mce/themes/advanced/editor_template_src.js vendored
View File

@ -175,7 +175,8 @@
theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom",
theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
//theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
theme_advanced_fonts : "Roboto=roboto;Lato=lato;Open sans=opensans;League gothic=leaguegothic",
theme_advanced_more_colors : 1,
theme_advanced_row_height : 23,
theme_advanced_resize_horizontal : 1,
@ -1153,6 +1154,9 @@
fz = n.style.fontSize;
if (!fn && n.style.fontFamily)
$( "#text-label_ifr" ).contents().find( "span" ).css("font-family",n.style.fontFamily);
$( "#text-label_ifr" ).contents().find( "em" ).css("font-family",n.style.fontFamily);
$( "#text-label_ifr").contents().find( "strong" ).css("font-family",n.style.fontFamily);
fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();
if (!fc && n.style.color)