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

2012-04-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* operation/menu.php
	 operation/events/events.php: SoundEvent popup now it's resizable in
	 IE.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-25 12:31:38 +00:00
parent 9b264bed95
commit be556244e2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-04-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/menu.php
operation/events/events.php: SoundEvent popup now it's resizable in
IE.
Merged from branches.
2012-04-25 Vanessa Gil <vanessa.gil@artica.es> 2012-04-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/performance.php: Changed the order of options. * godmode/setup/performance.php: Changed the order of options.

2
pandora_console/operation/events/events.php
View File

@ -273,7 +273,7 @@ if ($config["pure"] == 0) {
?> ?>
url = '<?php echo $url . 'operation/events/sound_events.php'; ?>'; url = '<?php echo $url . 'operation/events/sound_events.php'; ?>';
window.open(url, '<?php __('Sound Alerts'); ?>','width=300, height=300, toolbar=no, location=no, directories=no, status=no, menubar=no'); window.open(url, '<?php __('Sound Alerts'); ?>','width=300, height=300, toolbar=no, location=no, directories=no, status=no, menubar=no, resizable=yes');
} }
function openURLTagWindow(url) { function openURLTagWindow(url) {

2
pandora_console/operation/menu.php
View File

@ -269,7 +269,7 @@ if (check_acl ($config['id_user'], 0, "AR")) {
?> ?>
url = '<?php echo $url . 'operation/events/sound_events.php'; ?>'; url = '<?php echo $url . 'operation/events/sound_events.php'; ?>';
window.open(url, '<?php __('Sound Alerts'); ?>','width=475, height=275, toolbar=no, location=no, directories=no, status=no, menubar=no'); window.open(url, '<?php __('Sound Alerts'); ?>','width=475, height=275, resizable=yes, toolbar=no, location=no, directories=no, status=no, menubar=no');
} }
</script> </script>
<?php <?php