Merge branch 'main' into shelf-pagination

.github/workflows/black.yml

@@ -8,6 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: psf/black@stable
+      - uses: psf/black@21.4b2
-        with:
-          args: ". --check -l 80 -S"

bookwyrm/templates/search/book.html

@@ -57,18 +57,22 @@
 
 {% endif %}
 
-{% if not remote %}
 <p class="block">
     {% if request.user.is_authenticated %}
-    <a href="{{ request.path }}?q={{ query }}&type=book&remote=true">
+        {% if not remote %}
-        {% trans "Load results from other catalogues" %}
+        <a href="{{ request.path }}?q={{ query }}&type=book&remote=true">
-    </a>
+            {% trans "Load results from other catalogues" %}
+        </a>
+        {% else %}
+        <a href="{% url 'create-book' %}">
+            {% trans "Manually add book" %}
+        </a>
+        {% endif %}
     {% else %}
-    <a href="{% url 'login' %}">
+        <a href="{% url 'login' %}">
-        {% trans "Log in to import or add books." %}
+            {% trans "Log in to import or add books." %}
-    </a>
+        </a>
     {% endif %}
 </p>
-{% endif %}
 
 {% endblock %}

bookwyrm/urls.py

@@ -272,7 +272,7 @@ urlpatterns = [
     ),
     re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
     re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()),
-    re_path(r"^create-book/?$", views.EditBook.as_view()),
+    re_path(r"^create-book/?$", views.EditBook.as_view(), name="create-book"),
     re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
     re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
     re_path(