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

Merge branch 'ent-7959-problemas-visualizacion-alertas-sonoras' into 'develop' 

Fixed visual issues and handle browser zoom

Closes pandora_enterprise#7959

See merge request artica/pandorafms!4484
This commit is contained in:
Daniel Rodriguez 2021-11-15 10:12:37 +00:00
parent ddb156564d b61e7c6c58
commit b36318c450
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6162,9 +6162,8 @@ div.graph div.legend table {
.sound_events {
background-color: #494949;
max-width: 550px;
max-height: 400px;
margin-top: 40px;
margin: 40px 2em 0;
min-height: auto;
}
.w16px {

9
pandora_console/operation/menu.php
View File

@ -427,11 +427,18 @@ if (check_acl($config['id_user'], 0, 'ER')
<script type="text/javascript">
function openSoundEventWindow() {
url = '<?php echo ui_get_full_url('operation/events/sound_events.php'); ?>';
// devicePixelRatio knows how much zoom browser applied.
var windowScale = parseFloat(window.devicePixelRatio);
var defaultWidth = 600;
var defaultHeight = 450;
// If the scale is 1, no zoom has been applied.
var windowWidth = windowScale <= 1 ? defaultWidth : windowScale*defaultWidth;
var windowHeight = windowScale <= 1 ? defaultHeight : windowScale*defaultHeight + (defaultHeight*0.1);
window.open(
url,
'<?php __('Sound Alerts'); ?>',
'width=600, height=450, resizable=no, toolbar=no, location=no, directories=no, status=no, menubar=no'
'width='+windowWidth+', height='+windowHeight+', resizable=yes, toolbar=no, location=no, directories=no, status=no, menubar=no'
);
}
</script>