Merge branch '1386-Elemento-histograma-en-el-editor-se-ve-raro' into 'develop'

Change auto sla graphs size in visual console editor mode - #1386

See merge request artica/pandorafms!897
This commit is contained in:
vgilc 2017-10-26 11:19:23 +02:00
commit c38546fa65
2 changed files with 6 additions and 4 deletions

View File

@ -1967,6 +1967,8 @@ function setEventsBar(id_data, values) {
if (data['no_data'] == true) {
if (values['width'] == "0" || values['height'] == "0") {
$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
$("#" + id_data + " img").css('width', '500px');
$("#" + id_data + " img").css('height', '40px');
}
else {
$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
@ -1978,8 +1980,8 @@ function setEventsBar(id_data, values) {
$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
if($('#text-width').val() == 0 || $('#text-height').val() == 0){
$("#" + id_data + " img").css('width', '300px');
$("#" + id_data + " img").css('height', '180px');
$("#" + id_data + " img").css('width', '500px');
$("#" + id_data + " img").css('height', '40px');
}
else{
$("#" + id_data + " img").css('width', $('#text-width').val()+'px');

View File

@ -1081,10 +1081,10 @@ function visual_map_print_item($mode = "read", $layoutData,
if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
if($width == 0 || $height == 0){
if ($layoutData['id_metaconsole'] != 0) {
$img = '<img src="../../images/console/signes/module-events.png">';
$img = '<img src="../../images/console/signes/module-events.png" style="width:500px;height:40px;">';
}
else{
$img = '<img src="images/console/signes/module-events.png">';
$img = '<img src="images/console/signes/module-events.png" style="width:500px;height:40px;">';
}
}
else{