diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 140f715e10..f202154e97 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -11,7 +11,7 @@ env = Env() env.read_env() DOMAIN = env("DOMAIN") -VERSION = "0.4.2" +VERSION = "0.4.3" RELEASE_API = env( "RELEASE_API", diff --git a/bookwyrm/static/css/bookwyrm/components/_book_list.scss b/bookwyrm/static/css/bookwyrm/components/_book_list.scss index 0b10934892..3377de6b30 100644 --- a/bookwyrm/static/css/bookwyrm/components/_book_list.scss +++ b/bookwyrm/static/css/bookwyrm/components/_book_list.scss @@ -6,11 +6,11 @@ ol.ordered-list { counter-reset: list-counter; } -ol.ordered-list li { +ol.ordered-list > li { counter-increment: list-counter; } -ol.ordered-list li::before { +ol.ordered-list > li::before { content: counter(list-counter); position: absolute; left: -20px; diff --git a/bookwyrm/templates/notifications/items/boost.html b/bookwyrm/templates/notifications/items/boost.html index a1a0a24fbf..2c2bf695b9 100644 --- a/bookwyrm/templates/notifications/items/boost.html +++ b/bookwyrm/templates/notifications/items/boost.html @@ -118,7 +118,7 @@
- {% include 'snippets/status_preview.html' with status=related_status %} + {% include 'notifications/items/status_preview.html' with status=related_status %}
{{ related_status.published_date|timesince }} diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html index 0bface201f..9cda6b9280 100644 --- a/bookwyrm/templates/notifications/items/fav.html +++ b/bookwyrm/templates/notifications/items/fav.html @@ -119,7 +119,7 @@
- {% include 'snippets/status_preview.html' with status=related_status %} + {% include 'notifications/items/status_preview.html' with status=related_status %}
{{ related_status.published_date|timesince }} diff --git a/bookwyrm/templates/notifications/items/mention.html b/bookwyrm/templates/notifications/items/mention.html index 8640526358..c3b3c1f34d 100644 --- a/bookwyrm/templates/notifications/items/mention.html +++ b/bookwyrm/templates/notifications/items/mention.html @@ -51,7 +51,7 @@
- {% include 'snippets/status_preview.html' with status=related_status %} + {% include 'notifications/items/status_preview.html' with status=related_status %}
{{ related_status.published_date|timesince }} diff --git a/bookwyrm/templates/notifications/items/reply.html b/bookwyrm/templates/notifications/items/reply.html index 099e22078c..16c84d4395 100644 --- a/bookwyrm/templates/notifications/items/reply.html +++ b/bookwyrm/templates/notifications/items/reply.html @@ -54,7 +54,7 @@
- {% include 'snippets/status_preview.html' with status=related_status %} + {% include 'notifications/items/status_preview.html' with status=related_status %}
{{ related_status.published_date|timesince }} diff --git a/bookwyrm/templates/snippets/status_preview.html b/bookwyrm/templates/notifications/items/status_preview.html similarity index 53% rename from bookwyrm/templates/snippets/status_preview.html rename to bookwyrm/templates/notifications/items/status_preview.html index b1eb3eca7a..c5d31599b1 100644 --- a/bookwyrm/templates/snippets/status_preview.html +++ b/bookwyrm/templates/notifications/items/status_preview.html @@ -1,4 +1,17 @@ -{% if status.content %} +{% load i18n %} +{% if status.content_warning %} + +{% trans "Content warning" as text %} + + + {{ text }} + + + + {{ status.content_warning }} + + +{% elif status.content %} {{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} {{ status.mention_books.first.title }}{% endif %} diff --git a/bookwyrm/templates/user_menu.html b/bookwyrm/templates/user_menu.html index 3a31365516..2d23d1b244 100644 --- a/bookwyrm/templates/user_menu.html +++ b/bookwyrm/templates/user_menu.html @@ -68,9 +68,15 @@
  • - - {% trans 'Log out' %} - +
  • diff --git a/bookwyrm/views/landing/login.py b/bookwyrm/views/landing/login.py index ccee61297f..7cac5ad889 100644 --- a/bookwyrm/views/landing/login.py +++ b/bookwyrm/views/landing/login.py @@ -77,7 +77,7 @@ def post(self, request): class Logout(View): """log out""" - def get(self, request): + def post(self, request): """done with this place! outa here!""" logout(request) return redirect("/")