From 71f6e0d330adc56693f3cc9cd9f91d206e34e26f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 28 Mar 2021 11:15:26 -0700 Subject: [PATCH 1/5] Show invite request count --- bookwyrm/templates/settings/manage_invite_requests.html | 2 +- bookwyrm/views/invite.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html index a7648a7f..7a7088d9 100644 --- a/bookwyrm/templates/settings/manage_invite_requests.html +++ b/bookwyrm/templates/settings/manage_invite_requests.html @@ -23,7 +23,7 @@ {% trans "Ignored Invite Requests" %} {% else %} {% trans "Invite Requests" %} - {% endif %} + {% endif %} ({{ count }}) diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py index e4b98cba..106afe65 100644 --- a/bookwyrm/views/invite.py +++ b/bookwyrm/views/invite.py @@ -101,6 +101,7 @@ class ManageInviteRequests(View): data = { "ignored": ignored, + "count": paginated.count, "requests": paginated.page(page), } return TemplateResponse(request, "settings/manage_invite_requests.html", data) From 323c72002b4a795d414cf9c3d54dfcd6bb3e41dc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 28 Mar 2021 11:18:01 -0700 Subject: [PATCH 2/5] Fixes shelve menu display on book page --- bookwyrm/templates/book/book.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 0275eb1a..df92e11a 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -35,9 +35,11 @@
-
- {% include 'snippets/book_cover.html' with book=book size=large %} - {% include 'snippets/rate_action.html' with user=request.user book=book %} +
+
+ {% include 'snippets/book_cover.html' with book=book size=large %} + {% include 'snippets/rate_action.html' with user=request.user book=book %} +
{% include 'snippets/shelve_button/shelve_button.html' %} {% if request.user.is_authenticated and not book.cover %} @@ -48,7 +50,7 @@
{% endif %} -
+
{% if book.isbn_13 %}
From f0876b57c50cb45eb309f1d6b6f22a6b7df0970d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 28 Mar 2021 11:25:05 -0700 Subject: [PATCH 3/5] Fixes change shelf menu display on shelf page --- bookwyrm/templates/snippets/shelf.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/shelf.html b/bookwyrm/templates/snippets/shelf.html index 9ac7760c..8cae29e6 100644 --- a/bookwyrm/templates/snippets/shelf.html +++ b/bookwyrm/templates/snippets/shelf.html @@ -2,7 +2,7 @@ {% load i18n %} {% load bookwyrm_tags %} {% if books|length > 0 %} -
+
From 63b319e28604572739a761598d0244a7cf2b450b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 28 Mar 2021 11:27:09 -0700 Subject: [PATCH 4/5] Space between shelve button and isbn on book page --- bookwyrm/templates/book/book.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index df92e11a..aef8fba1 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -40,7 +40,9 @@ {% include 'snippets/book_cover.html' with book=book size=large %} {% include 'snippets/rate_action.html' with user=request.user book=book %} - {% include 'snippets/shelve_button/shelve_button.html' %} +
+ {% include 'snippets/shelve_button/shelve_button.html' %} +
{% if request.user.is_authenticated and not book.cover %}
From ecf5ee4afcf3e6f576198ce9ec54e0552f3afbc0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 28 Mar 2021 11:30:53 -0700 Subject: [PATCH 5/5] margin between quote and attribution --- bookwyrm/templates/snippets/status/status_content.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html index 53ccc5ca..43cdc5d2 100644 --- a/bookwyrm/templates/snippets/status/status_content.html +++ b/bookwyrm/templates/snippets/status/status_content.html @@ -28,7 +28,7 @@ {% if status.quote %}
-
{{ status.quote | safe }}
+
{{ status.quote | safe }}

— {% include 'snippets/book_titleby.html' with book=status.book %}