From 9ed4348095548ec002a6b2b88143536e9b7cd250 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Fri, 12 Apr 2024 09:11:29 +0200 Subject: [PATCH] #13438 Fixed text color for text editor in dark theme --- .../reporting/reporting_builder.item_editor.php | 12 +++++++++++- pandora_console/include/javascript/pandora.js | 7 ++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 5087bd5349..c9be26e409 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -52,6 +52,11 @@ if (! check_acl($config['id_user'], 0, 'RW') exit; } +// Get pandora black theme. +if ($config['style'] === 'pandora_black') { + html_print_input_hidden('selected_style_theme', 'pandora_black'); +} + $meta = false; if (($config['metaconsole'] == 1) && (defined('METACONSOLE'))) { $meta = true; @@ -6190,7 +6195,12 @@ $(document).ready (function () { }); }); - defineTinyMCE('#textarea_render_definition'); + var consoleStyle = $("#hidden-selected_style_theme").val(); + if (consoleStyle == "pandora_black") { + defineTinyMCEDark('#textarea_render_definition'); + } else { + defineTinyMCE('#textarea_render_definition'); + } $("#checkbox-select_by_group").change(function () { var select_by_group = $('#checkbox-select_by_group').prop('checked'); diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index c12f8b9147..32389622e1 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -1490,7 +1490,12 @@ function defineTinyMCEDark(selector) { { text: "C#", value: "csharp" }, { text: "C++", value: "cpp" } ], - toolbar: defaultToolbar + toolbar: defaultToolbar, + content_style: ` + body { + color: #fff; + } + ` }); }