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

2013-02-05 Sergio Martin <sergio.martin@artica.es> 

* godmode/reporting/visual_console_builder.editor.php: Fixed missed
	javascript and resource files inclusion in metaconsole for 
	bug #3602775



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-05 11:13:49 +00:00
parent aa51e3015d
commit 5eb69a1b29
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-02-05 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.editor.php: Fixed missed
javascript and resource files inclusion in metaconsole for
bug #3602775
2013-02-05 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager.php,

8
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -65,7 +65,7 @@ echo '<div id="background" class="" style="
margin: 0px auto;border: 2px black solid; width: ' . $widthBackground . 'px; height: ' . $heightBackground . 'px;">';
echo "<div id='background_grid'
style='position: absolute; display: none; overflow: hidden;
background: url(images/console/background/white_boxed.jpg);
background: url(" . ui_get_full_url('images/console/background/white_boxed.jpg', false, false, false) . ");
background-repeat: repeat; width: " . $widthBackground . "px; height: " . $heightBackground . "px;'></div>";
@ -106,7 +106,7 @@ ui_require_jquery_file('colorpicker');
ui_require_javascript_file('wz_jsgraphics');
ui_require_javascript_file('pandora_visual_console');
ui_require_javascript_file('visual_console_builder.editor', 'godmode/reporting/');
ui_require_javascript_file_enterprise('functions_visualmap', false);
ui_require_javascript_file_enterprise('functions_visualmap', defined('METACONSOLE'));
ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
// Javascript file for base 64 encoding of label parameter
@ -128,10 +128,10 @@ ui_require_javascript_file ('encode_decode_base64');
theme : "advanced",
<?php
if ($config['style'] == 'pandora_legacy') {
echo 'content_css: "include/styles/pandora_legacy.css",' . "\n";
echo 'content_css: "' . ui_get_full_url('include/styles/pandora_legacy.css', false, false, false) . '",' . "\n";
}
else {
echo 'content_css: "include/styles/pandora.css",' . "\n";
echo 'content_css: "' . ui_get_full_url('include/styles/pandora.css', false, false, false) . '",' . "\n";
}
?>
theme_advanced_font_sizes : "8pt=.visual_font_size_8pt, 14pt=.visual_font_size_14pt, 24pt=.visual_font_size_24pt, 36pt=.visual_font_size_36pt",