tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-3824-7869-Mapas-GIS-no-funcionan' into 'develop'

Browse Source 
Fixed problem with openlayer

See merge request artica/pandorafms!2330

Former-commit-id: 639deee6b66cf43894f4eb093d590d699bb9d37c
This commit is contained in:
Alejandro Fraguas 2019-04-03 16:02:45 +02:00
commit 54f6f595dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_ui.php
View File

@ -1736,10 +1736,6 @@ function ui_process_page_head($string, $bitfield)
// Include countdown library
$config['jquery']['countdown'] = 'include/javascript/jquery.countdown.js';
// Include timezone user map library
$config['jquery']['OpenLayers'] = 'include/javascript/OpenLayers.js';
$config['jquery']['jquery.timezone-picker'] = 'include/javascript/jquery.timezone-picker.js';
// Then add each script as necessary
$loaded = [''];
foreach ($config['jquery'] as $name => $filename) {

4
pandora_console/operation/users/user_edit.php
View File

@ -734,6 +734,10 @@ if (!defined('METACONSOLE')) {
<?php
// Closes no meta condition.
}
// Include OpenLayers and timezone user map library.
echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/OpenLayers.js').'"></script>'."\n\t";
echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/jquery.timezone-picker.js').'"></script>'."\n\t";
?>
<script language="javascript" type="text/javascript">