tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13438-Black-theme-editor-del-Item-de-reporte-Grouped-Custom-Render-se-ve-mal' into 'develop'

Browse Source 
Ent 13438 black theme editor del item de reporte grouped custom render se ve mal

See merge request artica/pandorafms!7187
This commit is contained in:
Jose Martin 2024-04-16 07:00:07 +00:00
commit 53ea4c9508
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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');

7
pandora_console/include/javascript/pandora.js
View File

@ -1490,7 +1490,12 @@ function defineTinyMCEDark(selector) {
{ text: "C#", value: "csharp" },
{ text: "C++", value: "cpp" }
],
toolbar: defaultToolbar
toolbar: defaultToolbar,
content_style: `
body {
color: #fff;
}
`
});
}