From b65200fde6496b8c58fb883ea7670b471a6badd6 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 22 Nov 2019 10:17:16 +0100 Subject: [PATCH 001/100] Solved issue with TinyMCE status bar. Now can view it properly --- .../javascript/tiny_mce/themes/advanced/skins/default/ui.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css b/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css index 023cd176b3..780abd9ea8 100644 --- a/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css +++ b/pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/ui.css @@ -22,7 +22,7 @@ .defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;} .defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top} .defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC} -.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:10px;} +.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:10px;} .defaultSkin .mceStatusbar div {float:left; margin:2px} .defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0} .defaultSkin .mceStatusbar a:hover {text-decoration:underline} From d181d5357b710ef484b8a37a92c9bedeea620971 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 26 Nov 2019 13:19:28 +0100 Subject: [PATCH 002/100] Created function for initialize TinyMCE --- .../godmode/alerts/configure_alert_action.php | 28 +++----- .../alerts/configure_alert_template.php | 30 ++++----- .../visual_console_builder.editor.php | 63 +++++------------- .../visual_console_builder.elements.php | 61 ++++++----------- pandora_console/godmode/setup/news.php | 17 +---- .../godmode/setup/setup_visuals.php | 33 +++------- .../godmode/snmpconsole/snmp_alert.php | 30 ++++----- pandora_console/include/javascript/pandora.js | 66 +++++++++++++++++++ 8 files changed, 149 insertions(+), 179 deletions(-) diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 8ea292445b..13d6e39470 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -418,24 +418,16 @@ $(document).ready (function () { $table_macros_field.show(); } - tinyMCE.init({ - selector: 'textarea.tiny-mce-editor', - theme : "advanced", - plugins : "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable", - theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsize,select", - theme_advanced_buttons2 : "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "left", - theme_advanced_resizing : true, - theme_advanced_statusbar_location : "bottom", - force_p_newlines : false, - forced_root_block : '', - inline_styles : true, - valid_children : "+body[style]", - element_format : "html" - }); - + var added_config = { + "selector": "textarea.tiny-mce-editor", + "plugins": "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable", + "theme_advanced_buttons1": "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect", + "theme_advanced_buttons2": "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor", + "valid_children": "+body[style]", + "width": "90%", + } + defineTinyMCE(added_config); + render_command_preview(original_command); render_command_recovery_preview(original_command); diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index d79ca90ca8..9d57ad341f 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -1310,23 +1310,19 @@ if ($step == 2) { } }); - tinyMCE.init({ - selector: 'textarea.tiny-mce-editor', - theme : "advanced", - plugins : "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable", - theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsize,select", - theme_advanced_buttons2 : "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "left", - theme_advanced_resizing : true, - theme_advanced_statusbar_location : "bottom", - force_p_newlines : false, - forced_root_block : '', - inline_styles : true, - valid_children : "+body[style]", - element_format : "html" - }); + var added_config = { + "selector": 'textarea.tiny-mce-editor', + "plugins": "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable", + "theme_advanced_buttons1": "bold,italic,underline,|,cut,copy,paste,|,justifyleft,justifycenter,justifyright,|,forecolor,backcolor,|,formatselect,fontselect,fontsizeselect", + "theme_advanced_buttons2": "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview", + "force_p_newlines" : false, + "forced_root_block" : '', + "inline_styles": true, + "valid_children": "+body[style]", + } + + defineTinyMCE(added_config); + diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 9b6697533f..d6c46435c1 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -195,54 +195,21 @@ ui_require_javascript_file('encode_decode_base64'); id_visual_console = ; visual_map_main(); - tinyMCE.init({ - mode : "exact", - elements: "text-label", - convert_urls: false, - theme : "advanced", - - theme_advanced_font_sizes : - "4pt=.visual_font_size_4pt, " + - "6pt=.visual_font_size_6pt, " + - "8pt=.visual_font_size_8pt, " + - "10pt=.visual_font_size_10pt, " + - "12pt=.visual_font_size_12pt, " + - "14pt=.visual_font_size_14pt, " + - "18pt=.visual_font_size_18pt, " + - "24pt=.visual_font_size_24pt, " + - "28pt=.visual_font_size_28pt, " + - "36pt=.visual_font_size_36pt, " + - "48pt=.visual_font_size_48pt, " + - "60pt=.visual_font_size_60pt, " + - "72pt=.visual_font_size_72pt, " + - "84pt=.visual_font_size_84pt, " + - "96pt=.visual_font_size_96pt, " + - "116pt=.visual_font_size_116pt, " + - "128pt=.visual_font_size_128pt, " + - "140pt=.visual_font_size_140pt, " + - "154pt=.visual_font_size_154pt, " + - "196pt=.visual_font_size_196pt", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "left", - theme_advanced_buttons1 : "bold,italic, |, justifyleft, justifycenter, justifyright, |,undo, redo, |, image, link, |, fontselect, |, forecolor, fontsizeselect, |, code", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_statusbar_location : "none", - width: "400", - height: "200", - nowrap: true, - plugins : "noneditable", - inline_styles : true, - valid_children : "+body[style]", - element_format : "html", - editor_deselector : "noselected" - }); + var added_config = { + "plugins": "noneditable", + "elements": "text-label", + "theme_advanced_buttons1": + "bold,italic,|,justifyleft,justifycenter,justifyright,|,undo,redo,|,image,link,|,fontselect,|,forecolor,fontsizeselect,|,code", + "valid_children": "+body[style]", + "theme_advanced_font_sizes": "true", + "content_css": , + "editor_deselector": "noselected", + "inline_styles": true, + "nowrap": true, + "width": "50%", + "height": "100%", + } + defineTinyMCE(added_config); $('.item img').each(function(){ diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 720bb57a1c..23436be6e9 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -710,48 +710,25 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');