From be32796bea250da5f284d4c6b6dbde9dba81ac9e Mon Sep 17 00:00:00 2001 From: ajurna Date: Wed, 20 May 2020 10:26:45 +0100 Subject: [PATCH] New reader based on reveal.js. works well on mobile and desktop and gives a better expierance all around. --- comic/models.py | 10 +- comic/templates/base.html | 12 +- comic/templates/comic/read_comic.html | 138 +- comic/urls.py | 4 +- comic/util.py | 2 +- comic/views.py | 41 +- static/js/hammer.js | 2643 +++++++ static/js/hammer.min.js | 7 + static/js/hammer.min.js.map | 1 + static/js/hammer.min.map | 1 + static/reveal.js/LICENSE | 19 + static/reveal.js/css/print/paper.css | 203 + static/reveal.js/css/print/pdf.css | 164 + static/reveal.js/css/reset.css | 30 + static/reveal.js/css/reveal.css | 1606 +++++ static/reveal.js/css/reveal.scss | 1777 +++++ static/reveal.js/css/theme/README.md | 21 + static/reveal.js/css/theme/beige.css | 277 + static/reveal.js/css/theme/black.css | 273 + static/reveal.js/css/theme/blood.css | 296 + static/reveal.js/css/theme/league.css | 279 + static/reveal.js/css/theme/moon.css | 277 + static/reveal.js/css/theme/night.css | 271 + static/reveal.js/css/theme/serif.css | 273 + static/reveal.js/css/theme/simple.css | 276 + static/reveal.js/css/theme/sky.css | 280 + static/reveal.js/css/theme/solarized.css | 277 + static/reveal.js/css/theme/source/beige.scss | 39 + static/reveal.js/css/theme/source/black.scss | 49 + static/reveal.js/css/theme/source/blood.scss | 78 + static/reveal.js/css/theme/source/league.scss | 34 + static/reveal.js/css/theme/source/moon.scss | 57 + static/reveal.js/css/theme/source/night.scss | 34 + static/reveal.js/css/theme/source/serif.scss | 35 + static/reveal.js/css/theme/source/simple.scss | 43 + static/reveal.js/css/theme/source/sky.scss | 46 + .../reveal.js/css/theme/source/solarized.scss | 63 + static/reveal.js/css/theme/source/white.scss | 49 + .../reveal.js/css/theme/template/mixins.scss | 29 + .../css/theme/template/settings.scss | 45 + .../reveal.js/css/theme/template/theme.scss | 325 + static/reveal.js/css/theme/white.css | 273 + static/reveal.js/js/reveal.js | 6191 +++++++++++++++++ 43 files changed, 16776 insertions(+), 72 deletions(-) create mode 100644 static/js/hammer.js create mode 100644 static/js/hammer.min.js create mode 100644 static/js/hammer.min.js.map create mode 100644 static/js/hammer.min.map create mode 100644 static/reveal.js/LICENSE create mode 100644 static/reveal.js/css/print/paper.css create mode 100644 static/reveal.js/css/print/pdf.css create mode 100644 static/reveal.js/css/reset.css create mode 100644 static/reveal.js/css/reveal.css create mode 100644 static/reveal.js/css/reveal.scss create mode 100644 static/reveal.js/css/theme/README.md create mode 100644 static/reveal.js/css/theme/beige.css create mode 100644 static/reveal.js/css/theme/black.css create mode 100644 static/reveal.js/css/theme/blood.css create mode 100644 static/reveal.js/css/theme/league.css create mode 100644 static/reveal.js/css/theme/moon.css create mode 100644 static/reveal.js/css/theme/night.css create mode 100644 static/reveal.js/css/theme/serif.css create mode 100644 static/reveal.js/css/theme/simple.css create mode 100644 static/reveal.js/css/theme/sky.css create mode 100644 static/reveal.js/css/theme/solarized.css create mode 100644 static/reveal.js/css/theme/source/beige.scss create mode 100644 static/reveal.js/css/theme/source/black.scss create mode 100644 static/reveal.js/css/theme/source/blood.scss create mode 100644 static/reveal.js/css/theme/source/league.scss create mode 100644 static/reveal.js/css/theme/source/moon.scss create mode 100644 static/reveal.js/css/theme/source/night.scss create mode 100644 static/reveal.js/css/theme/source/serif.scss create mode 100644 static/reveal.js/css/theme/source/simple.scss create mode 100644 static/reveal.js/css/theme/source/sky.scss create mode 100644 static/reveal.js/css/theme/source/solarized.scss create mode 100644 static/reveal.js/css/theme/source/white.scss create mode 100644 static/reveal.js/css/theme/template/mixins.scss create mode 100644 static/reveal.js/css/theme/template/settings.scss create mode 100644 static/reveal.js/css/theme/template/theme.scss create mode 100644 static/reveal.js/css/theme/white.css create mode 100644 static/reveal.js/js/reveal.js diff --git a/comic/models.py b/comic/models.py index e327c7b..eadca5c 100644 --- a/comic/models.py +++ b/comic/models.py @@ -131,13 +131,9 @@ class ComicBook(models.Model): out.prev_index = page - 1 out.prev_path = out.cur_path - if self.is_last_page(page): - out.next_path, out.next_index = self.nav_get_next_comic(user) - if out.next_index == -1: - out.q_next_to_directory = True - else: - out.next_index = page + 1 - out.next_path = out.cur_path + out.next_path, out.next_index = self.nav_get_next_comic(user) + if out.next_index == -1: + out.q_next_to_directory = True return out def nav_get_prev_comic(self, user): diff --git a/comic/templates/base.html b/comic/templates/base.html index 6e5fb3d..f6a1b57 100644 --- a/comic/templates/base.html +++ b/comic/templates/base.html @@ -20,6 +20,9 @@ +{# #} +{# #} + @@ -51,9 +54,9 @@ -