From 971ab72a499ffbd1b1516450ae62e7cfbf49804b Mon Sep 17 00:00:00 2001 From: Shizzz <kolmakov7@gmail.com> Date: Mon, 27 Mar 2017 02:23:39 +0700 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D1=82=D1=80=D0=BE=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=87=D0=B8=D1=82=D0=B0=D0=BB=D0=BA=D1=83=20=D0=B2=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B8=D0=B9=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84?= =?UTF-8?q?=D0=B5=D0=B9=D1=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пока не понятно, нужно это делать, или нет... В любом случае загрузку книг нужно перекладывать на JS, чтобы можно было разбивать книгу на страницы и запоминать место чтения. --- sopds_web_backend/templates/BookReader.html | 11 +++++++++++ sopds_web_backend/templates/sopds_books.html | 2 +- sopds_web_backend/urls.py | 3 +++ sopds_web_backend/views.py | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 sopds_web_backend/templates/BookReader.html diff --git a/sopds_web_backend/templates/BookReader.html b/sopds_web_backend/templates/BookReader.html new file mode 100644 index 0000000..85ae0f1 --- /dev/null +++ b/sopds_web_backend/templates/BookReader.html @@ -0,0 +1,11 @@ +{% extends "sopds_main.html" %} +{% load i18n %} +{% block body %} +<script> + var BookID = {{ book_id }}; + document.addEventListener("DOMContentLoaded", function(event) { + $('#ReaderBlock').load('{% url 'opds_catalog:read' book_id %}', function() {}); + }); +</script> +<div id="ReaderBlock"></div> +{% endblock %}{# body #} \ No newline at end of file diff --git a/sopds_web_backend/templates/sopds_books.html b/sopds_web_backend/templates/sopds_books.html index 700b941..01b1009 100644 --- a/sopds_web_backend/templates/sopds_books.html +++ b/sopds_web_backend/templates/sopds_books.html @@ -57,7 +57,7 @@ {% if b.format == 'fb2' and fb2tomobi %} <i><a href="{% url 'opds_catalog:convert' b.id 'mobi' %}"><span class="label small">mobi</span></a></i> {% endif %} - <i><a href="{% url 'opds_catalog:read' b.id %}"><span class="label small">{% trans "Read" %}</span></a></i> + <i><a href="{% url 'web:read' b.id %}"><span class="label small">{% trans "Read" %}</span></a></i> {% if isbookshelf %} <i><a href="#" onclick="del_bsbook({{ b.id }},'{{b.title}}');"><span class="secondary label small"> {% trans "Delete from bookshelf" %} </span></a></i> {% endif %} diff --git a/sopds_web_backend/urls.py b/sopds_web_backend/urls.py index 48c5679..7ff1ef3 100644 --- a/sopds_web_backend/urls.py +++ b/sopds_web_backend/urls.py @@ -1,3 +1,5 @@ +import logging +logging.basicConfig(filename='/var/www/sopds2/example.log',level=logging.DEBUG) from django.conf.urls import url from sopds_web_backend import views @@ -8,6 +10,7 @@ urlpatterns = [ url(r'^search/series/$',views.SearchSeriesView, name='searchseries'), url(r'^catalog/$',views.CatalogsView, name='catalog'), url(r'^book/$',views.BooksView, name='book'), + url(r'^book/read/(?P<book_id>[0-9]+)/$',views.BookReaderView, name='read'), url(r'^author/$',views.AuthorsView, name='author'), url(r'^genre/$',views.GenresView, name='genre'), url(r'^series/$',views.SeriesView, name='series'), diff --git a/sopds_web_backend/views.py b/sopds_web_backend/views.py index 3cc8696..5814982 100644 --- a/sopds_web_backend/views.py +++ b/sopds_web_backend/views.py @@ -548,3 +548,10 @@ def LogoutView(request): args = {} args['breadcrumbs'] = [_('Logout')] return redirect(reverse('web:main')) + +@sopds_login(url='web:login') +def BookReaderView(request,book_id): + args = {} + args['current'] = 'reader' + args['book_id'] = book_id + return render(request, 'BookReader.html', args) \ No newline at end of file -- GitLab