varia/xppl
14
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

fixed light=light missing in some routes

Browse Source
This commit is contained in:
nberting 2018-06-13 18:17:59 +02:00
parent 90b8585027
commit be41426018
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/about.html
View File

@ -13,7 +13,7 @@ This digital library gathers all the books and articles floating around on the s
It starts at XPUB, but can go anywhere we want it to. It starts at XPUB, but can go anywhere we want it to.
<br> <br>
<br> <br>
Are you interested in how this library works? Have a look at the source code in <a href 'https://git.xpub.nl/xpub-lib/log.html'> our git. </a> Are you interested in how this library works? Have a look at the source code in <a href= 'https://git.xpub.nl/xpub-lib/log.html'> our git. </a>
</p> </p>
<h2> What's the deal with the stacks? </h2> <h2> What's the deal with the stacks? </h2>
<p class='about'> <p class='about'>

8
app/templates/show_book_detail.html
View File

@ -109,7 +109,7 @@
<br><br> <br><br>
{%endif%} {%endif%}
{%if res %}
<div style="padding-bottom:20px;"> <div style="padding-bottom:20px;">
<h2>Annotations for <i>{{book.title}}</i>:</h4> <h2>Annotations for <i>{{book.title}}</i>:</h4>
{% for row in res%} {% for row in res%}
@ -128,6 +128,8 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{%else%}<div style="padding-bottom:50px;"><i> No annotations yet for this book </i></div>
{%endif%}
</div> </div>
<hr> <hr>
{% if previousbook %} {% if previousbook %}
@ -137,8 +139,4 @@
</div> </div>
{% endblock %} {% endblock %}

6
app/views.py
View File

@ -111,14 +111,14 @@ def annotations():
# id = book.id # id = book.id
annot = get_annotations() annot = get_annotations()
print(annot) print(annot)
return render_template('annotations.html', annot=annot, books=books) return render_template('annotations.html', annot=annot, books=books, light=light)
# PDF from annotations # PDF from annotations
@app.route('/annotations.pdf') @app.route('/annotations.pdf')
def annotations_pdf(): def annotations_pdf():
annot = get_annotations() annot = get_annotations()
# Make a PDF straight from HTML in a string. # Make a PDF straight from HTML in a string.
html = render_template(('annotations.html'), annot=annot) html = render_template(('annotations.html'), annot=annot, light=light)
return render_pdf(HTML(string=html)) return render_pdf(HTML(string=html))
@app.route('/viewpdf/<filename>') @app.route('/viewpdf/<filename>')
@ -204,7 +204,7 @@ def show_book_by_id(id):
if not book: if not book:
return render_template('red_link.html', id=id, light=light) return render_template('red_link.html', id=id, light=light)
else: else:
return render_template('show_book_detail.html', book=book, previousbook = previousbook, nextbook = nextbook, all_instances=all_instances, name=name, annot=annot, res=res) return render_template('show_book_detail.html', book=book, previousbook = previousbook, nextbook = nextbook, all_instances=all_instances, name=name, annot=annot, res=res, light=light)