Merge branch 'main' into production

bookwyrm-social · Jul 10, 2022 · cf59591 · cf59591
2 parents 7382f23 + bead43a
commit cf59591
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 12 deletions.
diff --git 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
@@ -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
@@ -118,7 +118,7 @@
 <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-muted{% endif %}">
     <div class="columns">
         <div class="column is-clipped">
-            {% include 'snippets/status_preview.html' with status=related_status %}
+            {% include 'notifications/items/status_preview.html' with status=related_status %}
         </div>
         <div class="column is-narrow has-text-muted">
             {{ related_status.published_date|timesince }}

diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html
@@ -119,7 +119,7 @@
 <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-muted{% endif %}">
     <div class="columns">
         <div class="column is-clipped">
-            {% include 'snippets/status_preview.html' with status=related_status %}
+            {% include 'notifications/items/status_preview.html' with status=related_status %}
         </div>
         <div class="column is-narrow has-text-muted">
             {{ related_status.published_date|timesince }}

diff --git a/bookwyrm/templates/notifications/items/mention.html b/bookwyrm/templates/notifications/items/mention.html
@@ -51,7 +51,7 @@
 <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-default{% endif %}">
     <div class="columns">
         <div class="column is-clipped">
-            {% include 'snippets/status_preview.html' with status=related_status %}
+            {% include 'notifications/items/status_preview.html' with status=related_status %}
         </div>
         <div class="column is-narrow has-text-default">
             {{ related_status.published_date|timesince }}

diff --git a/bookwyrm/templates/notifications/items/reply.html b/bookwyrm/templates/notifications/items/reply.html
@@ -54,7 +54,7 @@
 <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-default{% endif %}">
     <div class="columns">
         <div class="column is-clipped">
-            {% include 'snippets/status_preview.html' with status=related_status %}
+            {% include 'notifications/items/status_preview.html' with status=related_status %}
         </div>
         <div class="column is-narrow has-text-default">
             {{ related_status.published_date|timesince }}

diff --git a/...rm/templates/snippets/status_preview.html → ...s/notifications/items/status_preview.html b/...rm/templates/snippets/status_preview.html → ...s/notifications/items/status_preview.html
@@ -1,4 +1,17 @@
-{% if status.content %}
+{% load i18n %}
+{% if status.content_warning %}
+
+{% trans "Content warning" as text %}
+<span>
+    <span class="icon icon-warning is-size-5" title="{{ text }}">
+        <span class="is-sr-only">{{ text }}</span>
+    </span>
+
+    <a href="{{ status.local_path }}">
+        {{ status.content_warning }}
+    </a>
+</span>
+{% elif status.content %}
 <a href="{{ status.local_path }}">
     {{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} <em>{{ status.mention_books.first.title }}</em>{% endif %}
 </a>

diff --git a/bookwyrm/templates/user_menu.html b/bookwyrm/templates/user_menu.html
@@ -68,9 +68,15 @@
             <li class="navbar-divider" role="presentation" aria-hidden="true">&nbsp;</li>
 
             <li role="menuitem">
-                <a href="{% url 'logout' %}" class="navbar-item">
-                    {% trans 'Log out' %}
-                </a>
+                <form
+                    name="logout"
+                    method="POST"
+                    action="{% url 'logout' %}"
+                    class="navbar-item"
+                >
+                    {% csrf_token %}
+                    <button type="submit">{% trans 'Log out' %}</button>
+                </form>
             </li>
         </ul>
     </div>

diff --git 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("/")