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

2014-06-18 Alejandro Gallardo <alejandro.gallardo@artica.es> 

* godmode/reporting/visual_console_builder.editor.php:
	Added some buttons, like a control to edit the html code
	of the tinymce's textarea.

	* godmode/reporting/visual_console_builder.editor.js:
	Modified the funtion "hiddenFields" to enable the tinymce's
	code control only if the item is a label.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
alexhigh 2014-06-18 10:33:13 +00:00
parent c9d5e8d794
commit 775f327652
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2014-06-18 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/reporting/visual_console_builder.editor.php:
Added some buttons, like a control to edit the html code
of the tinymce's textarea.
* godmode/reporting/visual_console_builder.editor.js:
Modified the funtion "hiddenFields" to enable the tinymce's
code control only if the item is a label.
2014-06-18 Sergio Martin <sergio.martin@artica.es>
* include/graphs/flot/pandora.flot.js: Fixed position of the

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

@ -761,6 +761,14 @@ function hiddenFields(item) {
if (typeof(enterprise_hiddenFields) == 'function') {
enterprise_hiddenFields(item);
}
var code_control = tinyMCE.activeEditor.controlManager.controls['text-label_code'];
if (item == 'label') {
code_control.setDisabled(false);
}
else {
code_control.setDisabled(true);
}
}
function cleanFields(item) {

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

@ -139,12 +139,17 @@ ui_require_javascript_file ('encode_decode_base64');
theme_advanced_font_sizes : "8pt=.visual_font_size_8pt, 14pt=.visual_font_size_14pt, 24pt=.visual_font_size_24pt, 36pt=.visual_font_size_36pt, 72pt=.visual_font_size_72pt",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "bold,italic, |, image, link, |, forecolor, fontsizeselect",
theme_advanced_buttons1 : "bold,italic, |, justifyleft, justifycenter, justifyright, |,undo, redo, |, image, link, |, forecolor, fontsizeselect, |, code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "none",
width: "400",
height: "200",
nowrap: true
nowrap: true,
plugins : "noneditable",
inline_styles : true,
valid_children : "+body[style]",
element_format : "html",
editor_deselector : "noselected"
});
</script>