Merge pull request #1845 from bookwyrm-social/organizing-templatetags

Organizing templatetags

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 %}

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 %}

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 %}

bookwyrm/templates/discover/large-book.html

@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load rating_tags %}
 {% load i18n %}
 {% load utilities %}
 {% load status_display %}

bookwyrm/templates/discover/small-book.html

@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load landing_page_tags %}
 {% load utilities %}
 {% load i18n %}
 {% load status_display %}

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 %}
 

bookwyrm/templates/feed/suggested_books.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load feed_page_tags %}
 
 {% suggested_books as suggested_books %}
 <section class="block">

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 %}

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 %}
 

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 %}
 
 <h2 class="title is-5">Group Members</h2>
 {% if group.user == request.user %}

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 %}
 

bookwyrm/templates/landing/large-book.html

@@ -1,4 +1,5 @@
-{% load bookwyrm_tags %}
+{% load book_display_tags %}
+{% load rating_tags %}
 {% load markdown %}
 {% load i18n %}
 

bookwyrm/templates/landing/small-book.html

@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load rating_tags %}
 {% load i18n %}
 
 {% if book %}

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 %}

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 %}

bookwyrm/templates/notifications/items/layout.html

@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load notification_page_tags %}
 {% related_status notification as related_status %}
 <div class="notification {% if notification.id in unread %}has-background-primary{% endif %}">
     <div class="columns is-mobile {% if notification.id in unread %}has-text-white{% else %}has-text-grey{% endif %}">

bookwyrm/templates/shelf/shelf.html

@@ -1,5 +1,5 @@
 {% extends 'layout.html' %}
-{% load bookwyrm_tags %}
+{% load shelf_tags %}
 {% load utilities %}
 {% load humanize %}
 {% load i18n %}

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 %}

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 %}

bookwyrm/templates/snippets/create_status/layout.html

@@ -1,4 +1,3 @@
-{% load bookwyrm_tags %}
 {% load i18n %}
 {% load utilities %}
 {% load status_display %}

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 %}

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 %}

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 %}
 <div class="field is-grouped">
     <form action="/accept-group-invitation/" method="POST">

bookwyrm/templates/snippets/rate_action.html

@@ -1,5 +1,6 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load rating_tags %}
+
 {% if request.user.is_authenticated %}
 <span class="is-sr-only">{% trans "Leave a rating" %}</span>
 <div class="block">

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 %}

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 %}
 <span>{% trans "Move book" %}</span>

bookwyrm/templates/snippets/shelve_button/shelve_button.html

@@ -1,5 +1,5 @@
-{% load bookwyrm_tags %}
 {% load utilities %}
+{% load shelf_tags %}
 
 {% if request.user.is_authenticated %}
 

bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html

@@ -1,5 +1,5 @@
-{% load bookwyrm_tags %}
 {% load utilities %}
+{% load shelf_tags %}
 {% load i18n %}
 
 {% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}

bookwyrm/templates/snippets/shelve_button/shelve_button_options.html

@@ -1,5 +1,5 @@
-{% load bookwyrm_tags %}
 {% load utilities %}
+{% load shelf_tags %}
 {% load i18n %}
 
 {% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}

bookwyrm/templates/snippets/status/content_status.html

@@ -1,4 +1,5 @@
-{% load bookwyrm_tags %}
+{% load book_display_tags %}
+{% load rating_tags %}
 {% load markdown %}
 {% load i18n %}
 {% load static %}

bookwyrm/templates/snippets/status/generated_status.html

@@ -1,6 +1,6 @@
 {% spaceless %}
 
-{% load bookwyrm_tags %}
+{% load book_display_tags %}
 {% load markdown %}
 {% load i18n %}
 {% load cache %}

bookwyrm/templates/user/layout.html

@@ -4,7 +4,7 @@
 {% load utilities %}
 {% load markdown %}
 {% load layout %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
 
 {% block title %}{{ user.display_name }}{% endblock %}
 

bookwyrm/templates/user/user_preview.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load utilities %}
-{% load bookwyrm_tags %}
+{% load user_page_tags %}
 
 <div class="media block">
     <div class="media-left">