diff --git a/bookwyrm/templates/about/about.html b/bookwyrm/templates/about/about.html index d39d70486..acc89b0ec 100644 --- a/bookwyrm/templates/about/about.html +++ b/bookwyrm/templates/about/about.html @@ -2,7 +2,7 @@ {% load humanize %} {% load i18n %} {% load utilities %} -{% load bookwyrm_tags %} +{% load landing_page_tags %} {% load cache %} {% block title %} @@ -95,7 +95,7 @@

{% trans "Meet your admins" %}

{% url "conduct" as coc_path %} - {% blocktrans with site_name=site.name %} + {% blocktrans trimmed with site_name=site.name %} {{ site_name }}'s moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior. {% endblocktrans %}

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 8061d580c..afbf31784 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -141,12 +141,14 @@

{% blocktrans with name=author.name %}Books by {{ name }}{% endblocktrans %}

{% for book in books %} + {% with book=book.default_edition %}
{% include 'landing/small-book.html' with book=book %}
{% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+ {% endwith %} {% endfor %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index d2ab99b4b..43f2171c3 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} {% load i18n %} -{% load bookwyrm_tags %} +{% load book_display_tags %} {% load humanize %} {% load utilities %} {% load static %} diff --git a/bookwyrm/templates/book/file_links/links.html b/bookwyrm/templates/book/file_links/links.html index fbc95b566..2147bf6e0 100644 --- a/bookwyrm/templates/book/file_links/links.html +++ b/bookwyrm/templates/book/file_links/links.html @@ -1,5 +1,5 @@ {% load i18n %} -{% load bookwyrm_tags %} +{% load book_display_tags %} {% load utilities %} {% get_book_file_links book as links %} diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html index 1fa0afb92..a6ff0aca0 100644 --- a/bookwyrm/templates/discover/large-book.html +++ b/bookwyrm/templates/discover/large-book.html @@ -1,4 +1,4 @@ -{% load bookwyrm_tags %} +{% load rating_tags %} {% load i18n %} {% load utilities %} {% load status_display %} diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html index 76732ca14..2da93d522 100644 --- a/bookwyrm/templates/discover/small-book.html +++ b/bookwyrm/templates/discover/small-book.html @@ -1,4 +1,4 @@ -{% load bookwyrm_tags %} +{% load landing_page_tags %} {% load utilities %} {% load i18n %} {% load status_display %} diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html index e7b9280d7..ed828ae01 100644 --- a/bookwyrm/templates/feed/status.html +++ b/bookwyrm/templates/feed/status.html @@ -1,6 +1,6 @@ {% extends 'feed/layout.html' %} +{% load feed_page_tags %} {% load i18n %} -{% load bookwyrm_tags %} {% block opengraph_images %} diff --git a/bookwyrm/templates/feed/suggested_books.html b/bookwyrm/templates/feed/suggested_books.html index a3d3f1fad..435d4f513 100644 --- a/bookwyrm/templates/feed/suggested_books.html +++ b/bookwyrm/templates/feed/suggested_books.html @@ -1,5 +1,5 @@ {% load i18n %} -{% load bookwyrm_tags %} +{% load feed_page_tags %} {% suggested_books as suggested_books %}
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html index 1a71bda89..5f5b58601 100644 --- a/bookwyrm/templates/groups/group.html +++ b/bookwyrm/templates/groups/group.html @@ -1,7 +1,6 @@ {% extends 'groups/layout.html' %} {% load i18n %} -{% load bookwyrm_tags %} -{% load bookwyrm_group_tags %} +{% load group_tags %} {% load markdown %} {% block panel %} diff --git a/bookwyrm/templates/groups/layout.html b/bookwyrm/templates/groups/layout.html index a25c10850..e688bc771 100644 --- a/bookwyrm/templates/groups/layout.html +++ b/bookwyrm/templates/groups/layout.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} {% load i18n %} -{% load bookwyrm_group_tags %} +{% load group_tags %} {% block title %}{{ group.name }}{% endblock %} diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html index 8b06d178a..90236843f 100644 --- a/bookwyrm/templates/groups/members.html +++ b/bookwyrm/templates/groups/members.html @@ -1,8 +1,7 @@ {% load i18n %} {% load utilities %} {% load humanize %} -{% load bookwyrm_tags %} -{% load bookwyrm_group_tags %} +{% load group_tags %}

Group Members

{% if group.user == request.user %} diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html index c37717597..ec8bcee06 100644 --- a/bookwyrm/templates/landing/landing.html +++ b/bookwyrm/templates/landing/landing.html @@ -1,7 +1,7 @@ {% extends 'landing/layout.html' %} {% load i18n %} {% load cache %} -{% load bookwyrm_tags %} +{% load landing_page_tags %} {% block panel %} diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html index 03ec718ba..9b4fd1f93 100644 --- a/bookwyrm/templates/landing/large-book.html +++ b/bookwyrm/templates/landing/large-book.html @@ -1,4 +1,5 @@ -{% load bookwyrm_tags %} +{% load book_display_tags %} +{% load rating_tags %} {% load markdown %} {% load i18n %} diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html index 813fb797d..31b095803 100644 --- a/bookwyrm/templates/landing/small-book.html +++ b/bookwyrm/templates/landing/small-book.html @@ -1,4 +1,4 @@ -{% load bookwyrm_tags %} +{% load rating_tags %} {% load i18n %} {% if book %} diff --git a/bookwyrm/templates/lists/embed-list.html b/bookwyrm/templates/lists/embed-list.html index 54dc80ab2..186681670 100644 --- a/bookwyrm/templates/lists/embed-list.html +++ b/bookwyrm/templates/lists/embed-list.html @@ -1,7 +1,8 @@ {% extends 'embed-layout.html' %} {% load i18n %} -{% load bookwyrm_tags %} -{% load bookwyrm_group_tags %} +{% load book_display_tags %} +{% load rating_tags %} +{% load group_tags %} {% load markdown %} {% block title %}{% blocktrans with list_name=list.name owner=list.user.display_name %}{{ list_name }}, a list by {{owner}}{% endblocktrans %}{% endblock title %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 880413cdb..c44d3fe36 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -1,7 +1,8 @@ {% extends 'lists/layout.html' %} {% load i18n %} -{% load bookwyrm_tags %} -{% load bookwyrm_group_tags %} +{% load rating_tags %} +{% load book_display_tags %} +{% load group_tags %} {% load markdown %} {% block breadcrumbs %} diff --git a/bookwyrm/templates/notifications/items/layout.html b/bookwyrm/templates/notifications/items/layout.html index 6ddbdcc31..d595bf20e 100644 --- a/bookwyrm/templates/notifications/items/layout.html +++ b/bookwyrm/templates/notifications/items/layout.html @@ -1,4 +1,4 @@ -{% load bookwyrm_tags %} +{% load notification_page_tags %} {% related_status notification as related_status %}
diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html index 0e295a873..3a5652219 100644 --- a/bookwyrm/templates/shelf/shelf.html +++ b/bookwyrm/templates/shelf/shelf.html @@ -1,5 +1,5 @@ {% extends 'layout.html' %} -{% load bookwyrm_tags %} +{% load shelf_tags %} {% load utilities %} {% load humanize %} {% load i18n %} @@ -92,7 +92,7 @@ {% with count=books.paginator.count %} {% if count %} -

+ {% blocktrans trimmed count counter=count with formatted_count=count|intcomma %} {{ formatted_count }} book {% plural %} @@ -104,7 +104,7 @@ (showing {{ start }}-{{ end }}) {% endblocktrans %} {% endif %} -

+ {% endif %} {% endwith %} diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html index 2785d7c01..20194623a 100644 --- a/bookwyrm/templates/snippets/add_to_group_button.html +++ b/bookwyrm/templates/snippets/add_to_group_button.html @@ -1,5 +1,6 @@ {% load i18n %} -{% load bookwyrm_group_tags %} +{% load group_tags %} + {% if request.user == user or not request.user == group.user or not request.user.is_authenticated %} {% elif user in request.user.blocks.all %} {% include 'snippets/block_button.html' with blocks=True %} diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html index 10cdf639f..65b322699 100644 --- a/bookwyrm/templates/snippets/create_status/comment.html +++ b/bookwyrm/templates/snippets/create_status/comment.html @@ -1,5 +1,5 @@ {% extends "snippets/create_status/layout.html" %} -{% load bookwyrm_tags %} +{% load shelf_tags %} {% load i18n %} {% load utilities %} {% load status_display %} diff --git a/bookwyrm/templates/snippets/create_status/layout.html b/bookwyrm/templates/snippets/create_status/layout.html index 8d24fa021..0585638d9 100644 --- a/bookwyrm/templates/snippets/create_status/layout.html +++ b/bookwyrm/templates/snippets/create_status/layout.html @@ -1,4 +1,3 @@ -{% load bookwyrm_tags %} {% load i18n %} {% load utilities %} {% load status_display %} diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html index cf472c113..a9ddb17f4 100644 --- a/bookwyrm/templates/snippets/create_status/quotation.html +++ b/bookwyrm/templates/snippets/create_status/quotation.html @@ -1,5 +1,4 @@ {% extends "snippets/create_status/layout.html" %} -{% load bookwyrm_tags %} {% load utilities %} {% load status_display %} {% load i18n %} diff --git a/bookwyrm/templates/snippets/create_status/review.html b/bookwyrm/templates/snippets/create_status/review.html index 13d349caf..e52a7c1c4 100644 --- a/bookwyrm/templates/snippets/create_status/review.html +++ b/bookwyrm/templates/snippets/create_status/review.html @@ -1,5 +1,4 @@ {% extends "snippets/create_status/layout.html" %} -{% load bookwyrm_tags %} {% load utilities %} {% load status_display %} {% load i18n %} diff --git a/bookwyrm/templates/snippets/join_invitation_buttons.html b/bookwyrm/templates/snippets/join_invitation_buttons.html index 46c4071d4..b77ce43cb 100644 --- a/bookwyrm/templates/snippets/join_invitation_buttons.html +++ b/bookwyrm/templates/snippets/join_invitation_buttons.html @@ -1,5 +1,6 @@ {% load i18n %} -{% load bookwyrm_group_tags %} +{% load group_tags %} + {% if group|is_invited:request.user %}
diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html index 767039a3d..6ecbceffc 100644 --- a/bookwyrm/templates/snippets/rate_action.html +++ b/bookwyrm/templates/snippets/rate_action.html @@ -1,5 +1,6 @@ {% load i18n %} -{% load bookwyrm_tags %} +{% load rating_tags %} + {% if request.user.is_authenticated %} {% trans "Leave a rating" %}
diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html index 1672e0388..2e08760f3 100644 --- a/bookwyrm/templates/snippets/remove_from_group_button.html +++ b/bookwyrm/templates/snippets/remove_from_group_button.html @@ -1,5 +1,6 @@ {% load i18n %} -{% load bookwyrm_group_tags %} +{% load group_tags %} + {% if request.user == user or not request.user == group.user or not request.user.is_authenticated %} {% else %} {% if user in request.user.blocks.all %} diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html index 323e04a27..197cf5b6c 100644 --- a/bookwyrm/templates/snippets/shelf_selector.html +++ b/bookwyrm/templates/snippets/shelf_selector.html @@ -1,7 +1,7 @@ {% extends 'components/dropdown.html' %} -{% load i18n %} -{% load bookwyrm_tags %} +{% load shelf_tags %} {% load utilities %} +{% load i18n %} {% block dropdown-trigger %} {% trans "Move book" %} @@ -17,7 +17,7 @@ {% if shelf.editable %}