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

2014-06-02 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/alerts/configure_alert_template.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
	include/ajax/module.php, include/functions.php,
	include/functions_ui.php, extensions/insert_data.php,
	operation/netflow/nf_live_view.php,
	operation/reporting/reporting_viewer.php,
	operation/reporting/graph_viewer.php, operation/tree.php,
	operation/agentes/datos_agente.php,
	operation/agentes/estado_monitores.php: fixed the i18n of the
	timepicker.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-06-02 15:57:36 +00:00
parent 8e89441d59
commit a5912526d2
15 changed files with 40 additions and 42 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 @@
2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_template.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
include/ajax/module.php, include/functions.php,
include/functions_ui.php, extensions/insert_data.php,
operation/netflow/nf_live_view.php,
operation/reporting/reporting_viewer.php,
operation/reporting/graph_viewer.php, operation/tree.php,
operation/agentes/datos_agente.php,
operation/agentes/estado_monitores.php: fixed the i18n of the
timepicker.
2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the

4
pandora_console/extensions/insert_data.php
View File

@ -180,9 +180,7 @@ function mainInsertData() {
echo "</form>";
ui_require_css_file ('datepicker');
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
<script type="text/javascript">

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

@ -674,9 +674,7 @@ echo "<div id='all_modules_text' style='display: none;'>";
echo __("All modules");
echo "</div>";
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>

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

@ -740,9 +740,7 @@ echo '</form>';
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>

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

@ -1087,12 +1087,8 @@ else {
echo '</div>';
echo '</form>';
ui_require_jquery_file ("ui-timepicker-addon");
ui_include_time_picker();
ui_require_javascript_file('pandora');
// This script is included manually to be included after jquery and avoid error
if(file_exists('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js')) {
echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
}
if ($enterpriseEnable) {
reporting_enterprise_text_box();

4
pandora_console/godmode/setup/news.php
View File

@ -280,10 +280,8 @@ else {
* We must add javascript here. Otherwise, the date picker won't
* work if the date is not correct because php is returning.
*/
ui_include_time_picker();
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
// Include tiny for wysiwyg editor

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

@ -60,9 +60,8 @@ $get_module_detail = get_parameter ('get_module_detail', 0);
if ($get_module_detail) {
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
ui_require_jquery_file ("ui-timepicker-addon");

12
pandora_console/include/functions.php
View File

@ -339,15 +339,15 @@ function get_user_language ($id_user = null) {
$language = get_parameter('language', 0);
if (defined('METACONSOLE')) {
if ($id_user == null)
$id_user = $config['id_user'];
if ($language !== 0)
update_user($id_user, array('language' => $language));
}
if ($language === 'default') {
return $config['language'];
}
@ -363,7 +363,7 @@ function get_user_language ($id_user = null) {
if ($id_user !== null) {
$userinfo = get_user_info ($id_user);
if ($userinfo['language'] != 'default'){
if ($userinfo['language'] != 'default') {
return $userinfo['language'];
}
}
@ -381,7 +381,7 @@ function set_user_language() {
$l10n = NULL;
$user_language = get_user_language ();
if (file_exists ('./include/languages/'.$user_language.'.mo')) {
if (file_exists ('./include/languages/' . $user_language . '.mo')) {
$l10n = new gettext_reader (new CachedFileReader ('./include/languages/'.$user_language.'.mo'));
$l10n->load_tables();
}

7
pandora_console/include/functions_ui.php
View File

@ -3444,4 +3444,11 @@ function ui_get_error ($error_code) {
return array('title' => $title, 'message' => $message);
}
function ui_include_time_picker() {
ui_require_jquery_file ("ui-timepicker-addon");
if (file_exists('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js')) {
echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
}
}
?>

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

@ -293,9 +293,7 @@ else {
unset ($table);
}
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>

4
pandora_console/operation/agentes/estado_monitores.php
View File

@ -707,10 +707,8 @@ ui_require_css_file ('cluetip');
ui_require_jquery_file ('cluetip');
echo "<div id='module_details_dialog'></div>";
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>

2
pandora_console/operation/netflow/nf_live_view.php
View File

@ -392,7 +392,7 @@ if ($draw != '') {
enterprise_hook('close_meta_frame');
ui_require_jquery_file ("ui-timepicker-addon");
ui_include_time_picker();
?>
<script type="text/javascript">

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

@ -201,9 +201,7 @@ if ($view_graph) {
/* We must add javascript here. Otherwise, the date picker won't
work if the date is not correct because php is returning. */
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>
<script language="javascript" type="text/javascript">

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

@ -192,9 +192,7 @@ echo '</div>';
* work if the date is not correct because php is returning.
*/
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>

4
pandora_console/operation/tree.php
View File

@ -651,9 +651,7 @@ treeview_printTree($activeTab);
enterprise_hook('close_meta_frame');
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="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language() . '.js', false, false, false) . '"></script>';
ui_include_time_picker();
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
?>