From 78077e4ab12324c525480b409dc5d7c4ed17b9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 8 Apr 2014 20:50:44 +0200 Subject: [PATCH] Fix syntax and style errors and errors after deficient merge conflic resolving after branch merging. --- openslides/{ => core}/static/fonts/README.txt | 0 openslides/{ => core}/static/fonts/circle.ttf | Bin openslides/mediafile/widgets.py | 2 +- openslides/utils/pdf.py | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename openslides/{ => core}/static/fonts/README.txt (100%) rename openslides/{ => core}/static/fonts/circle.ttf (100%) diff --git a/openslides/static/fonts/README.txt b/openslides/core/static/fonts/README.txt similarity index 100% rename from openslides/static/fonts/README.txt rename to openslides/core/static/fonts/README.txt diff --git a/openslides/static/fonts/circle.ttf b/openslides/core/static/fonts/circle.ttf similarity index 100% rename from openslides/static/fonts/circle.ttf rename to openslides/core/static/fonts/circle.ttf diff --git a/openslides/mediafile/widgets.py b/openslides/mediafile/widgets.py index b0e23b02e..c065257bc 100644 --- a/openslides/mediafile/widgets.py +++ b/openslides/mediafile/widgets.py @@ -19,7 +19,7 @@ class PDFPresentationWidget(Widget): default_weight = 75 template_name = 'mediafile/widget_pdfpresentation.html' 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): pdfs = Mediafile.objects.filter( diff --git a/openslides/utils/pdf.py b/openslides/utils/pdf.py index c93130742..c38da3a0f 100644 --- a/openslides/utils/pdf.py +++ b/openslides/utils/pdf.py @@ -20,7 +20,6 @@ pdfmetrics.registerFont(TTFont( 'Ubuntu', path_join(settings.SITE_ROOT, 'core/static/fonts/Ubuntu-R.ttf'))) pdfmetrics.registerFont(TTFont( 'Ubuntu-Bold', path_join(settings.SITE_ROOT, 'core/static/fonts/Ubuntu-B.ttf'))) -pdfmetrics.registerFont(TTFont( pdfmetrics.registerFont(TTFont( 'circlefont', path_join(settings.SITE_ROOT, 'core/static/fonts/circle.ttf')))