ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix syntax and style errors and errors after deficient merge conflic

Browse Source 
resolving after branch merging.
This commit is contained in:
Norman Jäckel 2014-04-08 20:50:44 +02:00
parent e6dad6d087
commit 78077e4ab1
4 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
openslides/static/fonts/README.txt → openslides/core/static/fonts/README.txt
View File

0
openslides/static/fonts/circle.ttf → openslides/core/static/fonts/circle.ttf
View File

2
openslides/mediafile/widgets.py
View File

@ -19,7 +19,7 @@ class PDFPresentationWidget(Widget):
default_weight = 75 default_weight = 75
template_name = 'mediafile/widget_pdfpresentation.html' template_name = 'mediafile/widget_pdfpresentation.html'
more_link_pattern_name = 'mediafile_list' more_link_pattern_name = 'mediafile_list'
#javascript_files = None # TODO: Add pdf.js stuff here. # javascript_files = None # TODO: Add pdf.js stuff here.
def get_context_data(self, **context): def get_context_data(self, **context):
pdfs = Mediafile.objects.filter( pdfs = Mediafile.objects.filter(

1
openslides/utils/pdf.py
View File

@ -20,7 +20,6 @@ pdfmetrics.registerFont(TTFont(
'Ubuntu', path_join(settings.SITE_ROOT, 'core/static/fonts/Ubuntu-R.ttf'))) 'Ubuntu', path_join(settings.SITE_ROOT, 'core/static/fonts/Ubuntu-R.ttf')))
pdfmetrics.registerFont(TTFont( pdfmetrics.registerFont(TTFont(
'Ubuntu-Bold', path_join(settings.SITE_ROOT, 'core/static/fonts/Ubuntu-B.ttf'))) 'Ubuntu-Bold', path_join(settings.SITE_ROOT, 'core/static/fonts/Ubuntu-B.ttf')))
pdfmetrics.registerFont(TTFont(
pdfmetrics.registerFont(TTFont( pdfmetrics.registerFont(TTFont(
'circlefont', path_join(settings.SITE_ROOT, 'core/static/fonts/circle.ttf'))) 'circlefont', path_join(settings.SITE_ROOT, 'core/static/fonts/circle.ttf')))