-
-
-
-
- }} "{{entry.title}}")
-
-
-
-
{% endblock %}
{% block js %}
+
+
{% endblock %}
+
diff --git a/cps/web.py b/cps/web.py
old mode 100644
new mode 100755
index 528e1db4..7c3a1477
--- a/cps/web.py
+++ b/cps/web.py
@@ -25,7 +25,7 @@ import chardet # dependency of requests
import copy
from flask import Blueprint, jsonify
-from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
+from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for, Response
from flask import session as flask_session
from flask_babel import gettext as _
from flask_babel import get_locale
@@ -1214,22 +1214,20 @@ def download_link(book_id, book_format, anyname):
@download_required
def send_to_ereader(book_id, book_format, convert):
if not config.get_mail_server_configured():
- flash(_("Please configure the SMTP mail settings first."), category="error")
+ response = [{'type': "danger", 'message': _("Please configure the SMTP mail settings first...")}]
+ return Response(json.dumps(response), mimetype='application/json')
elif current_user.kindle_mail:
result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.config_calibre_dir,
current_user.name)
if result is None:
- flash(_("Success! Book queued for sending to %(eReadermail)s", eReadermail=current_user.kindle_mail),
- category="success")
ub.update_download(book_id, int(current_user.id))
+ response = [{'type': "success", 'message': _("Success! Book queued for sending to %(eReadermail)s",
+ eReadermail=current_user.kindle_mail)}]
else:
- flash(_("Oops! There was an error sending book: %(res)s", res=result), category="error")
+ response = [{'type': "danger", 'message': _("Oops! There was an error sending book: %(res)s", res=result)}]
else:
- flash(_("Oops! Please update your profile with a valid eReader Email."), category="error")
- if "HTTP_REFERER" in request.environ:
- return redirect(request.environ["HTTP_REFERER"])
- else:
- return redirect(url_for('web.index'))
+ response = [{'type': "danger", 'message': _("Oops! Please update your profile with a valid eReader Email.")}]
+ return Response(json.dumps(response), mimetype='application/json')
# ################################### Login Logout ##################################################################
- {% if current_user.role_download() %}
- {% if entry.data|length %}
-
- {% if entry.data|length < 2 %}
-
- {% for format in entry.data %}
-
- {{format.format}} ({{ format.uncompressed_size|filesizeformat }})
-
- {% endfor %}
- {% else %}
-
-
- {% endif %}
+
-
+
- {% endif %}
- {% if entry.series|length > 0 %}
-
+
+
+
+  }} "{{ entry.title }}")
- {% endif %}
- {% endif %}
- {% if current_user.kindle_mail and entry.email_share_list %}
-
- {% if entry.email_share_list.__len__() == 1 %}
- {{entry.email_share_list[0]['text']}}
- {% else %}
-
-
-
-
- {% endif %}
- {% endif %}
- {% if entry.reader_list and current_user.role_viewer() %}
-
- {% if entry.reader_list|length > 1 %}
-
-
- {% else %}
- {{_('Read in Browser')}} - {{entry.reader_list[0]}}
- {% endif %}
-
- {% endif %}
- {% if entry.audio_entries|length > 0 and current_user.role_viewer() %}
-
- {% if entry.audio_entries|length > 1 %}
-
-
-
+
- {{entry.title}}
- - {% if entry.ratings.__len__() > 0 %} - +{{ entry.title }}
+ + {% if entry.ratings.__len__() > 0 %} + {% endif %} - {% endfor %} - -{{_("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe)}}
+ {% if entry.series|length > 0 %} +{{ _("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe) }}
- {% endif %} + {% endif %} - {% if entry.languages.__len__() > 0 %} -
-
- {% endif %}
+ {% if entry.languages.__len__() > 0 %}
+ - {{_('Language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %} -
-
+
+ {% endif %}
- {% if entry.identifiers|length > 0 %}
- + {{ _('Language') }}: {% for language in entry.languages %} + {{ language.language_name }}{% if not loop.last %}, {% endif %}{% endfor %} +
+
-
- {% endif %}
+ {% if entry.identifiers|length > 0 %}
+ - - {% for identifier in entry.identifiers %} - {{identifier.format_type()}} - {%endfor%} -
-
+
+ {% endif %}
- {% if entry.tags|length > 0 %}
+ {% if entry.tags|length > 0 %}
-
+ {% endif %}
- {% if entry.publishers|length > 0 %}
- + + {% for identifier in entry.identifiers %} + {{ identifier.format_type() }} + {% endfor %} +
+
-
- {% endif %}
+ {% if entry.publishers|length > 0 %}
+ - {{_('Publisher')}}: - {{entry.publishers[0].name}} - -
-
+
+ {% endif %}
- {% if (entry.pubdate|string)[:10] != '0101-01-01' %}
- + {{ _('Publisher') }}: + {{ entry.publishers[0].name }} + +
+
-
- {% endif %}
- {% if cc|length > 0 %}
+ {% if (entry.pubdate|string)[:10] != '0101-01-01' %}
+ {{_('Published')}}: {{entry.pubdate|formatdate}}
-
+
+ {% endif %}
+ {% if cc|length > 0 %}
- {% for c in cc %}
- {{ _('Published') }}: {{ entry.pubdate|formatdate }}
+
- {% if entry['custom_column_' ~ c.id]|length > 0 %}
- {{ c.name }}:
- {% for column in entry['custom_column_' ~ c.id] %}
- {% if c.datatype == 'rating' %}
- {{ (column.value / 2)|formatfloat }}
- {% else %}
- {% if c.datatype == 'bool' %}
- {% if column.value == true %}
-
- {% else %}
-
- {% endif %}
- {% else %}
- {% if c.datatype == 'float' %}
- {{ column.value|formatfloat(2) }}
- {% elif c.datatype == 'datetime' %}
- {{ column.value|formatdate }}
- {% elif c.datatype == 'comments' %}
- {{column.value|safe}}
- {% elif c.datatype == 'series' %}
- {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
- {% elif c.datatype == 'text' %}
- {{ column.value.strip() }}{% if not loop.last %}, {% endif %}
- {% else %}
- {{ column.value }}
- {% endif %}
- {% endif %}
- {% endif %}
- {% endfor %}
- {% endif %}
-
- {% endfor %}
- {% endif %}
- {% if not current_user.is_anonymous %}
+ {% for c in cc %}
+
+ {% if entry['custom_column_' ~ c.id]|length > 0 %}
+ {{ c.name }}:
+ {% for column in entry['custom_column_' ~ c.id] %}
+ {% if c.datatype == 'rating' %}
+ {{ (column.value / 2)|formatfloat }}
+ {% else %}
+ {% if c.datatype == 'bool' %}
+ {% if column.value == true %}
+
+ {% else %}
+
+ {% endif %}
+ {% else %}
+ {% if c.datatype == 'float' %}
+ {{ column.value|formatfloat(2) }}
+ {% elif c.datatype == 'datetime' %}
+ {{ column.value|formatdate }}
+ {% elif c.datatype == 'comments' %}
+ {{ column.value|safe }}
+ {% elif c.datatype == 'series' %}
+ {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
+ {% elif c.datatype == 'text' %}
+ {{ column.value.strip() }}{% if not loop.last %}, {% endif %}
+ {% else %}
+ {{ column.value }}
+ {% endif %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endfor %}
+ {% endif %}
+ {% if not current_user.is_anonymous %}
-
-
- {% endif %}
+ -
- - {% if current_user.check_visibility(32768) %} --
- - {% endif %} -
+
+ {% endif %}
- {% if entry.comments|length > 0 and entry.comments[0].text|length > 0%}
- +
+ + {% if current_user.check_visibility(32768) %} ++
+ + {% endif %} +
+
+ {% endif %}
- {{ _('Description:') }}
+ {{ entry.comments[0].text|safe }} +
+
-
- {% if current_user.is_authenticated %}
- {% if current_user.shelf.all() or g.shelves_access %}
-
- {% endif %}
+ {% if current_user.is_authenticated %}
+ {% if current_user.shelf.all() or g.shelves_access %}
+
+ {% endif %}
- {% endif %}
- {% if current_user.role_edit() %}
-
-
- {% endif %}
-
{{_('Description:')}}
- {{entry.comments[0].text|safe}} -