diff --git a/bookwyrm/templates/import/import_status.html b/bookwyrm/templates/import/import_status.html index 6c5560dc..5b33f394 100644 --- a/bookwyrm/templates/import/import_status.html +++ b/bookwyrm/templates/import/import_status.html @@ -69,86 +69,92 @@ {% endblock %} {% block actions %}{% endblock %} - - - - - - - - - {% block import_cols_headers %} - - - {% endblock %} - - {% for item in items %} - - {% block index_col %} - - {% endblock %} - - - - - - {% block import_cols %} - - + {% endblock %} + + {% block action_row %}{% endblock %} + {% endfor %} +
- {% trans "Row" %} - - {% trans "Title" %} - - {% trans "ISBN" %} - - {% trans "Author" %} - - {% trans "Shelf" %} - - {% trans "Review" %} - - {% trans "Book" %} - - {% trans "Status" %} -
- {{ item.index }} - - {{ item.normalized_data.title }} - - {{ item.isbn }} - - {{ item.normalized_data.authors }} - - {{ item.normalized_data.shelf }} - -

{% include 'snippets/stars.html' with rating=item.rating %}

-

{{ item.review|truncatechars:100 }}

-
- {% if item.book %} - - {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' size='small' %} - - {% endif %} - - {% if item.book %} - - {% trans "Imported" %} +
+ + + + + + + + + {% block import_cols_headers %} + + + {% endblock %} + + {% for item in items %} + + {% block index_col %} + + {% endblock %} + + + + + + {% block import_cols %} + + - {% endblock %} - - {% block action_row %}{% endblock %} - {% endfor %} -
+ {% trans "Row" %} + + {% trans "Title" %} + + {% trans "ISBN" %} + + {% trans "Author" %} + + {% trans "Shelf" %} + + {% trans "Review" %} + + {% trans "Book" %} + + {% trans "Status" %} +
+ {{ item.index }} + + {{ item.normalized_data.title }} + + {{ item.isbn }} + + {{ item.normalized_data.authors }} + + {{ item.normalized_data.shelf }} + +

{% include 'snippets/stars.html' with rating=item.rating %}

+

{{ item.review|truncatechars:100 }}

+
+ {% if item.book %} + + {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' size='small' %} + + {% endif %} + + {% if item.book %} + + {% trans "Imported" %} - {% elif item.fail_reason %} - - - {{ item.fail_reason }} - - {% else %} - - {% trans "Pending" %} - {% endif %} -
+ {% elif item.fail_reason %} + + + {% if item.book_guess %} + {% trans "Needs manual review" %} + {% else %} + {{ item.fail_reason }} + {% endif %} + + {% else %} + + {% trans "Pending" %} + {% endif %} +
+
diff --git a/bookwyrm/templates/import/manual_review.html b/bookwyrm/templates/import/manual_review.html index 833e9d7f..4661520b 100644 --- a/bookwyrm/templates/import/manual_review.html +++ b/bookwyrm/templates/import/manual_review.html @@ -19,9 +19,6 @@ {% endblock %} {% block import_cols_headers %} - - {% trans "Actions" %} - {% endblock %} {% block index_col %} @@ -31,30 +28,11 @@ {% endblock %} {% block import_cols %} - -
-
- {% csrf_token %} - -
- -
- {% csrf_token %} - -
-
- {% endblock %} {% block action_row %} - +
{% with guess=item.book_guess %}
@@ -64,6 +42,23 @@
{% include 'snippets/book_titleby.html' with book=guess %} +
+
+ {% csrf_token %} + +
+ +
+ {% csrf_token %} + +
+
{% endwith %}