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

Merge branch '2125-Error_en_graficas_v721' into 'develop' 

Decreased limit to reduceText call in some graphs

See merge request artica/pandorafms!1407
This commit is contained in:
vgilc 2018-04-03 17:10:02 +02:00
parent 2b608bf914 dcaae924fc
commit fcec4b8b70
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -421,8 +421,8 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
// var shortLabel = reduceText(label, 25); // var shortLabel = reduceText(label, 25);
var title = label; var title = label;
var margin_top = 0; var margin_top = 0;
if(label.length > 33){ if(label.length > 30){
label = reduceText(label, 33); label = reduceText(label, 30);
} }
var div_attributes = 'style="font-size:'+font_size+'pt !important;' var div_attributes = 'style="font-size:'+font_size+'pt !important;'
+ ' margin: 0; max-width: 150px;' + ' margin: 0; max-width: 150px;'
@ -432,7 +432,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
div_attributes += "min-height: 2.5em;"; div_attributes += "min-height: 2.5em;";
} }
div_attributes += '" title="'+title+'" class="'+font+'"'; div_attributes += '" title="'+title+'" class="'+font+'" '+ ' style="overflow: hidden;"';
format.push([i,'<div ' + div_attributes + '>' format.push([i,'<div ' + div_attributes + '>'
+ label + label
@ -663,7 +663,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
} }
format.push([i, format.push([i,
'<div class="'+font+'" title="'+title+'" style="word-break: normal; transform: rotate(-45deg); position:relative; top:+30px; left:0px; max-width: 100px;font-size:'+font_size+'pt !important;">' '<div class="'+font+'" title="'+title+'" style="word-break: normal; overflow:hidden; transform: rotate(-45deg); position:relative; top:+30px; left:0px; max-width: 100px;font-size:'+font_size+'pt !important;">'
+ label + label
+ '</div>']); + '</div>']);
} }

1
pandora_console/include/styles/pandora.css
View File

@ -4630,7 +4630,6 @@ form ul.form_flex li ul li{
.tickLabel { .tickLabel {
white-space: nowrap; white-space: nowrap;
overflow-x: hidden;
line-height: 1.05em!important; line-height: 1.05em!important;
} }