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

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
This commit is contained in:
zarzuelo 2013-07-30 14:59:19 +00:00
parent 00733bdf42
commit f3e1789819
10 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -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,

3
pandora_console/extensions/insert_data.php
View File

@ -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">

3
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -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/");
?>

2
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -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/");
?>

3
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -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) {

3
pandora_console/include/ajax/module.php
View File

@ -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');

3
pandora_console/operation/agentes/datos_agente.php
View File

@ -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/");
?>

3
pandora_console/operation/reporting/graph_viewer.php
View File

@ -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">

3
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -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/");
?>

3
pandora_console/operation/tree.php
View File

@ -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/");
?>