Merge branch '566-visual-console-graficas-de-area-y-creador-de-elementos-open' into 'develop'

Adjust area graph position in vconsole dashboard / open - 

See merge request 
This commit is contained in:
vgilc 2017-04-07 12:38:53 +02:00
commit 9d7d4b9cad
2 changed files with 6 additions and 5 deletions
pandora_console

View File

@ -3125,9 +3125,8 @@ function move_elements_resize(original_width, original_height, width, height) {
} }
function unselectAll() { function unselectAll() {
$("#background").css('border', '1px lightgray solid'); $("#background").css('border', '1px lightgray solid');
$(".item").each(function(){
$(".item").each(function(){
$(this).css('border', ''); $(this).css('border', '');
if($(this).attr('withborder') == 'true'){ if($(this).attr('withborder') == 'true'){
$(this).css('top', '+=1'); $(this).css('top', '+=1');
@ -3136,7 +3135,7 @@ function unselectAll() {
} }
}); });
selectedItem = null;
} }
function click_button_toolbox(id) { function click_button_toolbox(id) {

View File

@ -265,7 +265,9 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
} }
$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true); $return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
$return .= "<div id='timestamp_$graph_id' class='timestamp_graph' style='font-size:".$font_size."pt;display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px; z-index:1000;'></div>"; $return .= "<div id='timestamp_$graph_id' class='timestamp_graph' style='font-size:".$font_size."pt;display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px; z-index:1000;'></div>";
$return .= "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>"; $return .= "<div id='$graph_id' class='";
if($type=='area_simple'){$return .= "noresizevc ";}
$return .= "graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>";
if ($menu) { if ($menu) {
$height = 100; $height = 100;
} }