Merge branch 'master' into Develop

# Conflicts:
#	cps/web.py
#	cps/worker.py
This commit is contained in:
Ozzieisaacs
2019-04-14 18:18:39 +02:00
5 changed files with 21 additions and 12 deletions
+1 -1
View File
@@ -40,7 +40,7 @@
</div>
{% endif %}
{% endif %}
{% if g.user.kindle_mail and g.user.is_authenticated and kindle_list %}
{% if g.user.kindle_mail and kindle_list %}
{% if kindle_list.__len__() == 1 %}
<a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" id="sendbtn" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</a>
{% else %}