From b448d4051424ddabafb9188eb9e42788c241b22f Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 7 Jun 2021 18:13:24 +0200 Subject: [PATCH] Use the right snippets on Templates --- bookwyrm/templates/book/book.html | 8 +++++-- bookwyrm/templates/feed/feed_layout.html | 3 ++- bookwyrm/templates/get_started/layout.html | 3 ++- bookwyrm/templates/import_status.html | 3 ++- bookwyrm/templates/layout.html | 22 ++++++++++--------- bookwyrm/templates/snippets/about.html | 4 +++- bookwyrm/templates/snippets/avatar.html | 4 +++- bookwyrm/templates/snippets/book_cover.html | 5 +++-- .../snippets/status/content_status.html | 5 +++-- .../snippets/status/status_header.html | 3 ++- 10 files changed, 38 insertions(+), 22 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index af2230200..0f0655517 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,5 +1,9 @@ {% extends 'layout.html' %} -{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %} +{% load i18n %} +{% load bookwyrm_tags %} +{% load humanize %} +{% load utilities %} +{% load static %} {% block title %}{{ book|book_title }}{% endblock %} @@ -309,5 +313,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html index 3c6b65a1b..07784418a 100644 --- a/bookwyrm/templates/feed/feed_layout.html +++ b/bookwyrm/templates/feed/feed_layout.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% load i18n %} +{% load static %} {% block title %}{% trans "Updates" %}{% endblock %} @@ -103,5 +104,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html index 63c042895..08a2e7c54 100644 --- a/bookwyrm/templates/get_started/layout.html +++ b/bookwyrm/templates/get_started/layout.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% load i18n %} +{% load static %} {% block title %}{% trans "Welcome" %}{% endblock %} @@ -9,7 +10,7 @@
- +

{% blocktrans %}Welcome to {{ site_name }}!{% endblocktrans %} diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html index ff80ad71c..b9d19318c 100644 --- a/bookwyrm/templates/import_status.html +++ b/bookwyrm/templates/import_status.html @@ -1,6 +1,7 @@ {% extends 'layout.html' %} {% load i18n %} {% load humanize %} +{% load static %} {% block title %}{% trans "Import Status" %}{% endblock %} @@ -151,5 +152,5 @@ {% endspaceless %}{% endblock %} {% block scripts %} - + {% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 56530a841..bf509d495 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -1,14 +1,16 @@ -{% load layout %}{% load i18n %} +{% load layout %} +{% load i18n %} +{% load static %} {% block title %}BookWyrm{% endblock %} | {{ site.name }} - - - + + + - + @@ -16,8 +18,8 @@ - - + + @@ -25,7 +27,7 @@
- +
@@ -237,8 +239,8 @@ - - + + {% block scripts %}{% endblock %} diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html index 820fb5759..a2b31b185 100644 --- a/bookwyrm/templates/snippets/about.html +++ b/bookwyrm/templates/snippets/about.html @@ -1,7 +1,9 @@ +{% load static %} +
- BookWyrm logo + BookWyrm logo
diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html index bb37c46d4..5f28cd4be 100644 --- a/bookwyrm/templates/snippets/avatar.html +++ b/bookwyrm/templates/snippets/avatar.html @@ -1,2 +1,4 @@ -{{ user.alt_text }} +{% load static %} + +{{ user.alt_text }} diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html index 16ab305e5..aa315e360 100644 --- a/bookwyrm/templates/snippets/book_cover.html +++ b/bookwyrm/templates/snippets/book_cover.html @@ -1,6 +1,7 @@ {% spaceless %} {% load i18n %} +{% load static %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html index 39ef9173c..c33b34526 100644 --- a/bookwyrm/templates/snippets/status/content_status.html +++ b/bookwyrm/templates/snippets/status/content_status.html @@ -1,6 +1,7 @@ {% load bookwyrm_tags %} {% load markdown %} {% load i18n %} +{% load static %} {% with status_type=status.status_type %}
{{ attachment.caption }}