From 364bc423bdf980205b78c5d15bbd6d35136f9a53 Mon Sep 17 00:00:00 2001
From: zarzuelo <zarzuelo@gmail.com>
Date: Tue, 30 Jul 2013 14:59:19 +0000
Subject: [PATCH] 2013-07-30 Sergio Martin <sergio.martin@artica.es>
* include/ajax/module.php
extensions/insert_data.php
operation/tree.php
operation/reporting/reporting_viewer.php
operation/reporting/graph_viewer.php
operation/agentes/datos_agente.php
godmode/agentes/planned_downtime.editor.php
godmode/alerts/configure_alert_template.php
godmode/reporting/reporting_builder.item_editor.php: Change
the inclusion of timepicker language file from jquery include
function to manually way to avoid jQuery errors
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 14 ++++++++++++++
pandora_console/extensions/insert_data.php | 3 ++-
.../godmode/agentes/planned_downtime.editor.php | 3 ++-
.../godmode/alerts/configure_alert_template.php | 2 +-
.../reporting/reporting_builder.item_editor.php | 3 ++-
pandora_console/include/ajax/module.php | 3 ++-
pandora_console/operation/agentes/datos_agente.php | 3 ++-
.../operation/reporting/graph_viewer.php | 3 ++-
.../operation/reporting/reporting_viewer.php | 3 ++-
pandora_console/operation/tree.php | 3 ++-
10 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ecec6db9c8..2a8da3104b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,17 @@
+2013-07-30 Sergio Martin <sergio.martin@artica.es>
+
+ * include/ajax/module.php
+ extensions/insert_data.php
+ operation/tree.php
+ operation/reporting/reporting_viewer.php
+ operation/reporting/graph_viewer.php
+ operation/agentes/datos_agente.php
+ godmode/agentes/planned_downtime.editor.php
+ godmode/alerts/configure_alert_template.php
+ godmode/reporting/reporting_builder.item_editor.php: Change
+ the inclusion of timepicker language file from jquery include
+ function to manually way to avoid jQuery errors
+
2013-07-30 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/functions.ajax.php,
diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 1b662765f0..6fcf935874 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -186,7 +186,8 @@ function mainInsertData() {
ui_require_css_file ('datepicker');
ui_require_jquery_file ("ui-timepicker-addon");
- ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+ // This script is included manually to be included after jquery and avoid error
+ echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
<script type="text/javascript">
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index a3ddec9555..61c6aaea26 100755
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -674,7 +674,8 @@ echo __("All modules");
echo "</div>";
ui_require_jquery_file ("ui-timepicker-addon");
-ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+// This script is included manually to be included after jquery and avoid error
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index f816361282..dc860d3626 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -735,7 +735,7 @@ enterprise_hook('close_meta_frame');
ui_require_javascript_file ('pandora_alerts');
ui_require_jquery_file ("ui-timepicker-addon");
// This script is included manually to be included after jquery and avoid error
-echo '<script type="text/javascript" src="' . $config['homeurl'] . 'include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '"></script>';
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 2debb11fe5..f425d11e95 100644
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1053,7 +1053,8 @@ echo '</form>';
ui_require_jquery_file ("ui-timepicker-addon");
ui_require_javascript_file('pandora');
-ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+// This script is included manually to be included after jquery and avoid error
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
if ($enterpriseEnable) {
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index f959d7919e..894affec3e 100644
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -21,7 +21,8 @@ include_once($config['homedir'] . "/include/functions_ui.php");
require_once ($config['homedir'] . '/enterprise/include/functions_metaconsole.php');
ui_require_jquery_file ("ui-timepicker-addon");
-ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+// This script is included manually to be included after jquery and avoid error
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
$search_modules = get_parameter('search_modules');
diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php
index 05e4c02729..4cd50b767e 100755
--- a/pandora_console/operation/agentes/datos_agente.php
+++ b/pandora_console/operation/agentes/datos_agente.php
@@ -294,7 +294,8 @@ else {
}
ui_require_jquery_file ("ui-timepicker-addon");
-ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+// This script is included manually to be included after jquery and avoid error
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index c1f1a3a60b..b825d2bd7d 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -196,7 +196,8 @@ if ($view_graph) {
work if the date is not correct because php is returning. */
ui_require_jquery_file ("ui-timepicker-addon");
- ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+ // This script is included manually to be included after jquery and avoid error
+ echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
<script language="javascript" type="text/javascript">
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index d53741b97a..021a919ea0 100644
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -190,7 +190,8 @@ echo '</div>';
*/
ui_require_jquery_file ("ui-timepicker-addon");
-ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+// This script is included manually to be included after jquery and avoid error
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 7fe527219a..ef8aff13c0 100644
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -651,7 +651,8 @@ treeview_printTree($activeTab);
enterprise_hook('close_meta_frame');
ui_require_jquery_file ("ui-timepicker-addon");
-ui_require_javascript_file("i18n/jquery-ui-timepicker-" . get_user_language());
+// This script is included manually to be included after jquery and avoid error
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>