Commit 971ab72a authored by Shizzz's avatar Shizzz
Browse files

Встроил читалку в общий интерфейс.

Пока не понятно, нужно это делать, или нет... В любом случае загрузку
книг нужно перекладывать на JS, чтобы можно было разбивать книгу на
страницы и запоминать место чтения.
parent 808ac694
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
{% 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
+1 −1
Original line number Diff line number Diff line
@@ -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>&nbsp;
			{% endif %}			
            <i><a href="{% url 'opds_catalog:read' b.id %}"><span class="label small">{% trans "Read" %}</span></a></i>&nbsp;
            <i><a href="{% url 'web:read' b.id %}"><span class="label small">{% trans "Read" %}</span></a></i>&nbsp;
			{% if isbookshelf %}
			&nbsp;&nbsp;<i><a href="#" onclick="del_bsbook({{ b.id }},'{{b.title}}');"><span class="secondary label small">&nbsp;{% trans "Delete from bookshelf" %}&nbsp;</span></a></i>
		    {% endif %}
+3 −0
Original line number Diff line number Diff line
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'),
+7 −0
Original line number Diff line number Diff line
@@ -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