From e77a63a91ff2f9899168e79df3c1b62e7297a0e9 Mon Sep 17 00:00:00 2001 From: daniel <daniel.barbero@artica.es> Date: Thu, 4 May 2023 12:57:01 +0200 Subject: [PATCH] fix select2 pandora_enterprise#11110 --- pandora_console/include/functions_ui.php | 2 +- .../operation/events/sound_events.php | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index a5bdb1218f..4dcf94edf1 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1770,7 +1770,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta if (is_metaconsole() && (isset($config['requirements_use_base_url']) === false - || $config['requirements_use_base_url'] === false) && $filename !== 'include/javascript/select2.min.js' + || $config['requirements_use_base_url'] === false) ) { $config['js'][$name] = '../../'.$filename; } else { diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index f71dd0fa5d..c4a968e3df 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -55,15 +55,24 @@ if (check_acl($config['id_user'], 0, 'ER') === false return; } -ob_start('ui_process_page_head'); -ob_start(); echo '<html>'; echo '<head>'; - -echo '<title>'.__('Accoustic console').'</title>'; -ui_require_css_file('wizard'); -ui_require_css_file('discovery'); ?> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<title><?php echo __('Accoustic console'); ?>)</title> +<link rel="stylesheet" href="../../include/styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" /> +<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" /> +<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css?v=<?php echo $config['current_package']; ?>" type="text/css" /> +<link rel="stylesheet" href="../../include/styles/select2.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" /> +<link rel="stylesheet" href="../../include/styles/wizard.css?v=<?php echo $config['current_package']; ?>" type="text/css" /> +<link rel="stylesheet" href="../../include/styles/discovery.css?v=<?php echo $config['current_package']; ?>" type="text/css" /> +<script type='text/javascript' src='../../include/javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script> +<script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script> +<script type='text/javascript' src='../../include/javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script> +<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script> +<script type='text/javascript' src='../../include/javascript/select2.min.js?v=<?php echo $config['current_package']; ?>'></script> +<script type='text/javascript' src='../../include/javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script> + <style type='text/css'> * { margin: 0;