Merge pull request #3332 from emanuelschuetze/fontsize
Added config option for standard font size in PDF.
This commit is contained in:
commit
3c9a67d084
@ -61,7 +61,8 @@ Core:
|
|||||||
(e. g. a list of speakers of a motion) [#3301].
|
(e. g. a list of speakers of a motion) [#3301].
|
||||||
- Select the projector resolution with a slider and an aspect ratio [#3311].
|
- Select the projector resolution with a slider and an aspect ratio [#3311].
|
||||||
- Delay the 'could not load projector' error 3 seconds to not irritate users
|
- Delay the 'could not load projector' error 3 seconds to not irritate users
|
||||||
with a slow internet connection [#3323]
|
with a slow internet connection [#3323].
|
||||||
|
- Added config value for standard font size in PDF [#3332].
|
||||||
|
|
||||||
Mediafiles:
|
Mediafiles:
|
||||||
- Fixed reloading of PDF on page change [#3274].
|
- Fixed reloading of PDF on page change [#3274].
|
||||||
|
@ -121,7 +121,7 @@ def get_config_variables():
|
|||||||
name='general_export_pdf_pagenumber_alignment',
|
name='general_export_pdf_pagenumber_alignment',
|
||||||
default_value='center',
|
default_value='center',
|
||||||
input_type='choice',
|
input_type='choice',
|
||||||
label='Pagenumber alignment in PDF',
|
label='Page number alignment in PDF',
|
||||||
choices=(
|
choices=(
|
||||||
{'value': 'left', 'display_name': 'Left'},
|
{'value': 'left', 'display_name': 'Left'},
|
||||||
{'value': 'center', 'display_name': 'Center'},
|
{'value': 'center', 'display_name': 'Center'},
|
||||||
@ -130,6 +130,19 @@ def get_config_variables():
|
|||||||
group='General',
|
group='General',
|
||||||
subgroup='Export')
|
subgroup='Export')
|
||||||
|
|
||||||
|
yield ConfigVariable(
|
||||||
|
name='general_export_pdf_fontsize',
|
||||||
|
default_value='10',
|
||||||
|
input_type='choice',
|
||||||
|
label='Standard font size in PDF',
|
||||||
|
choices=(
|
||||||
|
{'value': '10', 'display_name': '10'},
|
||||||
|
{'value': '11', 'display_name': '11'},
|
||||||
|
{'value': '12', 'display_name': '12'}),
|
||||||
|
weight=148,
|
||||||
|
group='General',
|
||||||
|
subgroup='Export')
|
||||||
|
|
||||||
# Projector
|
# Projector
|
||||||
|
|
||||||
yield ConfigVariable(
|
yield ConfigVariable(
|
||||||
|
@ -224,12 +224,13 @@ angular.module('OpenSlidesApp.core.pdf', [])
|
|||||||
// Generates the document(definition) for pdfMake
|
// Generates the document(definition) for pdfMake
|
||||||
var getDocument = function(noFooter) {
|
var getDocument = function(noFooter) {
|
||||||
var content = contentProvider.getContent();
|
var content = contentProvider.getContent();
|
||||||
|
var standardFontsize = Config.get('general_export_pdf_fontsize').value;
|
||||||
return {
|
return {
|
||||||
pageSize: 'A4',
|
pageSize: 'A4',
|
||||||
pageMargins: [75, 90, 75, 75],
|
pageMargins: [75, 90, 75, 75],
|
||||||
defaultStyle: {
|
defaultStyle: {
|
||||||
font: 'PdfFont',
|
font: 'PdfFont',
|
||||||
fontSize: 10
|
fontSize: standardFontsize
|
||||||
},
|
},
|
||||||
header: getHeader(),
|
header: getHeader(),
|
||||||
footerTpl: noFooter ? '' : getFooter(),
|
footerTpl: noFooter ? '' : getFooter(),
|
||||||
@ -246,7 +247,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
|
|||||||
color: 'grey'
|
color: 'grey'
|
||||||
},
|
},
|
||||||
preamble: {
|
preamble: {
|
||||||
fontSize: 10,
|
fontSize: standardFontsize,
|
||||||
margin: [0,0,0,10],
|
margin: [0,0,0,10],
|
||||||
},
|
},
|
||||||
userDataTitle: {
|
userDataTitle: {
|
||||||
|
@ -1883,10 +1883,11 @@ angular.module('OpenSlidesApp.core.site', [
|
|||||||
gettext('Allow access for anonymous guest users');
|
gettext('Allow access for anonymous guest users');
|
||||||
gettext('Show this text on the login page');
|
gettext('Show this text on the login page');
|
||||||
gettext('Separator used for all csv exports and examples');
|
gettext('Separator used for all csv exports and examples');
|
||||||
gettext('Pagenumber alignment in PDF');
|
gettext('Page number alignment in PDF');
|
||||||
gettext('Left');
|
gettext('Left');
|
||||||
gettext('Center');
|
gettext('Center');
|
||||||
gettext('Right');
|
gettext('Right');
|
||||||
|
gettext('Standard font size in PDF');
|
||||||
gettext('Show logo on projector');
|
gettext('Show logo on projector');
|
||||||
gettext('You can replace the logo by uploading an image and set it as ' +
|
gettext('You can replace the logo by uploading an image and set it as ' +
|
||||||
'the "Projector logo" in "files".');
|
'the "Projector logo" in "files".');
|
||||||
|
Loading…
Reference in New Issue
Block a user