CAMP/edgware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed imagebox default border, trying to fix print multiple pages

Browse Source
This commit is contained in:
sanj 2010-07-30 20:30:59 +05:30
parent 6c8eb7b1bb
commit 7b3c0cf18d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edgware/editor/views.py
View File

@ -585,12 +585,10 @@ def article_pdf(request):
pages = Page.objects.filter(article=article) pages = Page.objects.filter(article=article)
m = article.get_print_multiplier(dpi) m = article.get_print_multiplier(dpi)
url = SITE_BASE + "/edit/view_article/%d/?m=%f" % (article.id, m) url = SITE_BASE + "/edit/view_article/%d/?m=%f" % (article.id, m)
url_list = [url] # url_list = [url]
'''
for p in pages: for p in pages:
url = SITE_BASE + "/edit/view_article/%d/?m=%f" % (article.id, m) url = SITE_BASE + "/edit/view_article/%d/?m=%f" % (article.id, m)
url_list.append(url) url_list.append(url)
'''
output_path = MEDIA_ROOT + "/pdf/" + article.name + "_" + str(article.current_revision()) + ".pdf" output_path = MEDIA_ROOT + "/pdf/" + article.name + "_" + str(article.current_revision()) + ".pdf"
pdf_path = print_url_list(url_list, width_mm, height_mm, dpi, output_path) pdf_path = print_url_list(url_list, width_mm, height_mm, dpi, output_path)
return HttpResponseRedirect(pdf_path.replace(MEDIA_ROOT, "/static")) return HttpResponseRedirect(pdf_path.replace(MEDIA_ROOT, "/static"))

2
edgware/static/js/editor.js
View File

@ -638,7 +638,7 @@ ImageBox.prototype.create = function(json) {
'height': that.css.height, 'height': that.css.height,
'width': that.css.width, 'width': that.css.width,
'border-style': 'solid', 'border-style': 'solid',
'border-width': '3px', 'border-width': '0px',
'border-color': '#000000', 'border-color': '#000000',
'z-index': '1', 'z-index': '1',
'top': '100px', 'top': '100px',