add mr changes and remove setup font token
This commit is contained in:
parent
e1e5475f9c
commit
ce2abf1fb5
|
@ -21,4 +21,7 @@ PREPARE pr_oum755 FROM @st_oum755;
|
||||||
EXECUTE pr_oum755;
|
EXECUTE pr_oum755;
|
||||||
DEALLOCATE PREPARE pr_oum755;
|
DEALLOCATE PREPARE pr_oum755;
|
||||||
|
|
||||||
|
UPDATE `tconfig` set value = 'lato.ttf' WHERE token LIKE 'custom_report_front_font';
|
||||||
|
UPDATE `tconfig` set value = 'lato.ttf' WHERE token LIKE 'fontpath';
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
|
@ -616,36 +616,6 @@ $table_font->style[0] = 'font-weight: bold;';
|
||||||
$table_font->size[0] = '50%';
|
$table_font->size[0] = '50%';
|
||||||
$table_font->data = [];
|
$table_font->data = [];
|
||||||
|
|
||||||
$table_font->data[$row][0] = __('Graphs font family');
|
|
||||||
|
|
||||||
// Load font families.
|
|
||||||
$fonts = [];
|
|
||||||
$dirFonts = scandir(_MPDF_TTFONTPATH);
|
|
||||||
foreach ($dirFonts as $entryDir) {
|
|
||||||
if (strstr($entryDir, '.ttf') !== false) {
|
|
||||||
$explode = explode('-', $entryDir);
|
|
||||||
if (count($explode) === 1) {
|
|
||||||
$fonts[$entryDir] = substr($entryDir, 0, (strlen($entryDir) - 4));
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($explode[1] === 'Regular.ttf') {
|
|
||||||
$fonts[$explode[0].'.ttf'] = $explode[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$table_font->data[$row][1] = html_print_select(
|
|
||||||
$fonts,
|
|
||||||
'fontpath',
|
|
||||||
io_safe_output($config['fontpath']),
|
|
||||||
'',
|
|
||||||
'',
|
|
||||||
0,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
$row++;
|
|
||||||
|
|
||||||
$table_font->data[$row][0] = __('Graphs font size');
|
$table_font->data[$row][0] = __('Graphs font size');
|
||||||
|
|
||||||
$font_size_array = [
|
$font_size_array = [
|
||||||
|
@ -1150,20 +1120,6 @@ $table_report->data[$row][1] = "<input type ='number' value=".$config['font_size
|
||||||
|
|
||||||
$row++;
|
$row++;
|
||||||
|
|
||||||
$table_report->data[$row][0] = __('PDF font family');
|
|
||||||
$table_report->data[$row][1] = html_print_select(
|
|
||||||
$fonts,
|
|
||||||
'custom_report_front_font',
|
|
||||||
$config['custom_report_front_font'],
|
|
||||||
false,
|
|
||||||
__('Default'),
|
|
||||||
'',
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
$row++;
|
|
||||||
|
|
||||||
|
|
||||||
$table_report->data[$row][0] = __('Graph image height for HTML reports');
|
$table_report->data[$row][0] = __('Graph image height for HTML reports');
|
||||||
$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
|
$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,6 @@
|
||||||
* {
|
* {
|
||||||
font-size: 9pt;
|
font-size: 9pt;
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
line-height: 16pt;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
|
|
Loading…
Reference in New Issue