Merge pull request #1196 from emanuelschuetze/fix-1195

Fixed #1195: Correct path to circle.png on ballot paper (assignment and ...
This commit is contained in:
Oskar Hahn 2014-01-29 01:01:18 -08:00
commit a823812029
4 changed files with 23 additions and 17 deletions

View File

@ -7,7 +7,7 @@ How to create a new portable Windows distribution of OpenSlides:
2. Install all required python packages (see requirements_production.txt):
easy_install -Z django django-mptt beautifulsoup4 bleach pillow reportlab sockjs_tornado tornado django-haystack whoosh
easy_install -Z django django-mptt beautifulsoup4 bleach jsonfield pillow reportlab setuptools sockjs_tornado tornado django-haystack whoosh
3. Install pywin32 from binary installer:

View File

@ -43,6 +43,15 @@ LIBEXCLUDE = [
SITE_PACKAGES = {
"beautifulsoup4": {
"copy": ["bs4"],
},
"bleach": {
"copy": ["bleach"],
},
"html5lib": {
"copy": ["html5lib"],
},
"django": {
"copy": ["django"],
"exclude": [
@ -60,9 +69,18 @@ SITE_PACKAGES = {
r"^django/contrib/webdesign/",
]
},
"django-haystack": {
"copy": ["haystack"],
},
"django-mptt": {
"copy": ["mptt"],
},
"jsonfield": {
"copy": ["jsonfield"],
},
"pillow": {
"copy": ["PIL"],
},
"reportlab": {
"copy": [
"reportlab",
@ -72,8 +90,8 @@ SITE_PACKAGES = {
"sgmlop.pyd",
],
},
"pillow": {
"copy": ["PIL"],
"setuptools": {
"copy": ["pkg_resources.py"],
},
"sockjs-tornado": {
"copy": ["sockjs"],
@ -81,18 +99,6 @@ SITE_PACKAGES = {
"tornado": {
"copy": ["tornado"],
},
"beautifulsoup4": {
"copy": ["bs4"],
},
"bleach": {
"copy": ["bleach"],
},
"html5lib": {
"copy": ["html5lib"],
},
"django-haystack": {
"copy": ["haystack"],
},
"whoosh": {
"copy": ["whoosh"],
},

View File

@ -506,7 +506,7 @@ class AssignmentPollPDF(PDFView):
pdf_document.build(story)
def append_to_pdf(self, story):
imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png')
imgpath = os.path.join(settings.SITE_ROOT, 'core', 'static', 'img', 'circle.png')
circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
cell = []
cell.append(Spacer(0, 0.8 * cm))

View File

@ -258,7 +258,7 @@ def all_motion_cover(pdf, motions):
def motion_poll_to_pdf(pdf, poll):
imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png')
imgpath = os.path.join(settings.SITE_ROOT, 'core', 'static', 'img', 'circle.png')
circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
cell = []
cell.append(Spacer(0, 0.8 * cm))