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

Ticket 477. Fixed some bug in the visual console

This commit is contained in:
Daniel Maya 2017-03-14 15:54:46 +01:00
parent fd4b62f604
commit f4350aed6b
4 changed files with 18 additions and 1526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -414,11 +414,11 @@ function update_button_palette_callback() {
$('#' + idItem + ' table').remove(); $('#' + idItem + ' table').remove();
$('#' + idItem).append(tempoimg); $('#' + idItem).append(tempoimg);
$("#" + idItem + ' table').css('height',''); $("#" + idItem + ' table').css('height','');
$("#" + idItem + ' table').css('width','100%'); $("#" + idItem + ' table').css('width','70');
$("#" + idItem + ' span').css('width','100%'); $("#" + idItem + ' span').css('width','70');
$("#" + idItem + ' img').css('margin-top',''); $("#" + idItem + ' img').css('margin-top','');
//if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){ //if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){
$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px'); //$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//} //}
//else{ //else{
//$("#" + idItem + ' img').css('margin-left',''); //$("#" + idItem + ' img').css('margin-left','');
@ -433,15 +433,15 @@ function update_button_palette_callback() {
$('#' + idItem + ' img').remove(); $('#' + idItem + ' img').remove();
$('#' + idItem).append(tempoimg); $('#' + idItem).append(tempoimg);
$("#" + idItem + ' table').css('height',''); $("#" + idItem + ' table').css('height','');
$("#" + idItem + ' table').css('width','100%'); $("#" + idItem + ' table').css('width','70');
$("#" + idItem + ' span').css('width','100%'); $("#" + idItem + ' span').css('width','70');
$("#" + idItem + ' img').css('margin-top',''); $("#" + idItem + ' img').css('margin-top','');
//if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){ //if(parseInt($("#" + idItem).css('width'))-parseInt($("#" + idItem + " img").css('width'))/2 == 0 || values['height'] == 0 || values['width'] == 0){
//$("#" + idItem + ' img').css('margin-left',''); //$("#" + idItem + ' img').css('margin-left','');
//} //}
//else{ //else{
$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px'); //$("#" + idItem + ' img').css('margin-left',(parseInt($("#" + idItem).css('width'))/2)-(parseInt($("#" + idItem + " img").css('width'))/2)+'px');
//} //}
$("#" + idItem + ' > p').remove(); $("#" + idItem + ' > p').remove();
} }
@ -1992,7 +1992,7 @@ function createItem(type, values, id_data) {
if(values['label_position'] == 'up'){ if(values['label_position'] == 'up'){
item item
.append('<table><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>') .append('<table style="width:70px"><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
.append($image) .append($image)
.append($image) .append($image)
.append($input); .append($input);
@ -2002,7 +2002,7 @@ function createItem(type, values, id_data) {
item item
.append($image) .append($image)
.append($image) .append($image)
.append('<table><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>') .append('<table style="width:70px"><tr><td></td></tr><tr><td><span id="text_'+id_data+'" class="text">'+values['label']+'</span></td></tr><tr><td></td></tr></table>')
.append($input); .append($input);
} }
else if(values['label_position'] == 'left'){ else if(values['label_position'] == 'left'){

3
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -240,7 +240,6 @@ ui_require_javascript_file ('encode_decode_base64');
else{ else{
$('#period_row').css('display',''); $('#period_row').css('display','');
} }
}) });
</script> </script>

1509
pandora_console/include/javascript/tiny_mce/themes/advanced/editor_template.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -2441,11 +2441,11 @@ span#plugin_description {
font-size: 8pt !important; font-size: 8pt !important;
line-height: 8pt; line-height: 8pt;
} }
.visual_font_size_10pt, .visual_font_size_10pt > em , .visual_font_size_10pt > strong, .visual_font_size_10pt > strong > em, .visual_font_size_10pt > em > strong, .visual_font_size_10pt em span, .visual_font_size_10pt span em { .visual_font_size_10pt, .visual_font_size_10pt > em, .visual_font_size_10pt > strong, .visual_font_size_10pt > strong > span , .visual_font_size_10pt > span, .visual_font_size_10pt > strong > em, .visual_font_size_10pt > em > strong, .visual_font_size_10pt em span, .visual_font_size_10pt span em {
font-size: 10pt !important; font-size: 10pt !important;
line-height: 10pt; line-height: 10pt;
} }
.visual_font_size_12pt, .visual_font_size_12pt > em , .visual_font_size_12pt > strong, .visual_font_size_12pt > strong > em, .visual_font_size_12pt > em > strong, .visual_font_size_12pt em span, .visual_font_size_12pt span em { .visual_font_size_12pt, .visual_font_size_12pt > em, .visual_font_size_12pt > strong, .visual_font_size_12pt > strong > span , .visual_font_size_12pt > span, .visual_font_size_12pt > strong > em, .visual_font_size_12pt > em > strong, .visual_font_size_12pt em span, .visual_font_size_12pt span em {
font-size: 12pt !important; font-size: 12pt !important;
line-height: 12pt; line-height: 12pt;
} }