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

Merge branch '786-consolas-visuales-en-modo-full-screen-no-respetan-el-color-de-fondo-open' into 'develop' 

Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786

See merge request !417
This commit is contained in:
vgilc 2017-04-27 17:24:59 +02:00
parent b11865ccae a99eba3a45
commit 211183e382
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -282,18 +282,28 @@ $(document).ready (function () {
}); });
//Preload image size and activate auto image size changer when user click over a image in the selector
var size_changer_state = false;
$("#background").change(function() { $("#background").change(function() {
$('#imagen2').attr('src','images/console/background/'+$('#background').val()); $('#imagen2').attr('src','images/console/background/'+$('#background').val());
$('#imagen2').width(230); $('#imagen2').width(230);
$('#imagen2').show(); $('#imagen2').show();
}); });
$("#background").click(function(){
size_changer_state = true;
});
$("#background").mouseout(function() { $("#background").mouseout(function() {
if(size_changer_state){
$('#imagen').attr('src','images/console/background/'+$('#background').val()); $('#imagen').attr('src','images/console/background/'+$('#background').val());
$('input[name=width]').val($('#imagen').width()); $('input[name=width]').val($('#imagen').width());
$('input[name=height]').val($('#imagen').height()); $('input[name=height]').val($('#imagen').height());
$('#preimagew').html($('#imagen').width()); $('#preimagew').html($('#imagen').width());
$('#preimageh').html($('#imagen').height()); $('#preimageh').html($('#imagen').height());
}
}); });
$("#file-background_image").change(function(){ $("#file-background_image").change(function(){

6
pandora_console/operation/visual_console/render_view.php
View File

@ -198,10 +198,16 @@ if ($config['pure']) {
/* Avoid the main_pure container 1000px height */ /* Avoid the main_pure container 1000px height */
body.pure { body.pure {
min-height: 100px; min-height: 100px;
<?php
echo "background-color: ".$layout['background_color'].";";
?>
} }
div#main_pure { div#main_pure {
height: 100%; height: 100%;
margin: 0px; margin: 0px;
<?php
echo "background-color: ".$layout['background_color'].";";
?>
} }
</style> </style>
<?php <?php