tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop'

Browse Source 
fixes in reports front page default setup

See merge request artica/pandorafms!3250
This commit is contained in:
Daniel Rodriguez 2020-06-24 12:43:23 +02:00
commit 5aef38dd72
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1065,8 +1065,12 @@ $row++;
} }
} }
// Logo // Logo.
$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo'); $table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
true
);
$table_report->data['custom_report_front-logo'][1] = html_print_select( $table_report->data['custom_report_front-logo'][1] = html_print_select(
$customLogos, $customLogos,
'custom_report_front_logo', 'custom_report_front_logo',
@ -1076,7 +1080,7 @@ $row++;
'', '',
true true
); );
// Preview // Preview.
$table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview'; $table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview';
if (empty($config['custom_report_front_logo'])) { if (empty($config['custom_report_front_logo'])) {
$config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg'; $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg';
@ -1084,23 +1088,32 @@ $row++;
$table_report->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>'; $table_report->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>';
// Header // Header.
$table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header'); $table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header');
// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
$table_report->data['custom_report_front-header'][1] = html_print_textarea( $table_report->data['custom_report_front-header'][1] = html_print_textarea(
'custom_report_front_header', 'custom_report_front_header',
5, 5,
15, 15,
$config['custom_report_front_header'], io_safe_output($config['custom_report_front_header']),
'style="width: 38em;"', 'style="width: 38em;"',
true true
); );
// First page // First page.
// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
if ($config['custom_report_front']) {
$firstpage_content = $config['custom_report_front_firstpage'];
} else {
$firstpage_content = io_safe_output($config['custom_report_front_firstpage']);
}
$table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page'); $table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page');
$custom_report_front_firstpage = str_replace( $custom_report_front_firstpage = str_replace(
'(_URLIMAGE_)', '(_URLIMAGE_)',
ui_get_full_url(false, true, false, false), ui_get_full_url(false, true, false, false),
$config['custom_report_front_firstpage'] io_safe_output($firstpage_content)
); );
$table_report->data['custom_report_front-first_page'][1] = html_print_textarea( $table_report->data['custom_report_front-first_page'][1] = html_print_textarea(
'custom_report_front_firstpage', 'custom_report_front_firstpage',
@ -1111,13 +1124,15 @@ $row++;
true true
); );
// Footer // Footer.
$table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer'); $table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer');
// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
$table_report->data['custom_report_front-footer'][1] = html_print_textarea( $table_report->data['custom_report_front-footer'][1] = html_print_textarea(
'custom_report_front_footer', 'custom_report_front_footer',
5, 5,
15, 15,
$config['custom_report_front_footer'], io_safe_output($config['custom_report_front_footer']),
'style="width: 38em;"', 'style="width: 38em;"',
true true
); );