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

Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' 

Added token in visual styles to change the font size in items of reports - #4670

See merge request artica/pandorafms!2798
This commit is contained in:
Daniel Rodriguez 2019-11-12 18:09:39 +01:00
parent 2aaf78b4ab 18679f90e5
commit 073ca73b2a
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,7 +557,7 @@ $row++;
// For 5.1 Autohidden menu feature // For 5.1 Autohidden menu feature
$table_styles->data['autohidden'][0] = __('Autohidden menu'); $table_styles->data['autohidden'][0] = __('Automatically hide submenu');
$table_styles->data['autohidden'][1] = html_print_checkbox_switch( $table_styles->data['autohidden'][1] = html_print_checkbox_switch(
'autohidden_menu', 'autohidden_menu',
1, 1,
@ -1032,6 +1032,12 @@ $row++;
); );
$row++; $row++;
$table_other->data[$row][0] = __('Font size for items reports');
$table_other->data[$row][1] = "<input type ='number' value=".$config['font_size_item_report']." size='1' name='font_size_item_report' min='1' max='9' step='0.1'>";
$row++;
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
$dirItems = scandir($config['homedir'].'/images/custom_logo'); $dirItems = scandir($config['homedir'].'/images/custom_logo');
foreach ($dirItems as $entryDir) { foreach ($dirItems as $entryDir) {

8
pandora_console/include/functions_config.php
View File

@ -1281,6 +1281,10 @@ function config_update_config()
} }
// Juanma (06/05/2014) New feature: Custom front page for reports. // Juanma (06/05/2014) New feature: Custom front page for reports.
if (!config_update_value('font_size_item_report', get_parameter('font_size_item_report', 2))) {
$error_update[] = __('Font size for items reports');
}
if (!config_update_value('custom_report_front', get_parameter('custom_report_front'))) { if (!config_update_value('custom_report_front', get_parameter('custom_report_front'))) {
$error_update[] = __('Custom report front'); $error_update[] = __('Custom report front');
} }
@ -2805,6 +2809,10 @@ function config_process_config()
config_update_value('custom_report_front', 0); config_update_value('custom_report_front', 0);
} }
if (!isset($config['font_size_item_report'])) {
config_update_value('font_size_item_report', 2);
}
if (!isset($config['custom_report_front_font'])) { if (!isset($config['custom_report_front_font'])) {
config_update_value('custom_report_front_font', 'FreeSans.ttf'); config_update_value('custom_report_front_font', 'FreeSans.ttf');
} }

8
pandora_console/include/functions_reporting_html.php
View File

@ -447,7 +447,7 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
if ($mini) { if ($mini) {
$font_size = '1.5'; $font_size = '1.5';
} else { } else {
$font_size = '3'; $font_size = $config['font_size_item_report'];
} }
$metaconsole_on = is_metaconsole(); $metaconsole_on = is_metaconsole();
@ -2493,7 +2493,7 @@ function reporting_html_monitor_report($table, $item, $mini, $pdf=0)
if ($mini) { if ($mini) {
$font_size = '1.5'; $font_size = '1.5';
} else { } else {
$font_size = '3'; $font_size = $config['font_size_item_report'];
} }
$table->colspan['module']['cell'] = 3; $table->colspan['module']['cell'] = 3;
@ -2735,10 +2735,12 @@ function reporting_html_min_value(&$table, $item, $mini)
function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
global $config;
if ($mini) { if ($mini) {
$font_size = '1.5'; $font_size = '1.5';
} else { } else {
$font_size = '3'; $font_size = $config['font_size_item_report'];
} }
if (isset($item['visual_format']) && $item['visual_format'] != 0 if (isset($item['visual_format']) && $item['visual_format'] != 0