diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index d2b862d2c..fd8eeb368 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load book_display_tags %}

{% trans "Suggestions" %} @@ -16,19 +17,29 @@ {% else %}
    {% for item in items %} -
  1. +
  2. -
    - {% with book=item.book %} -
    - +
    + {% with item_book=item.book %} + +
    +

    + {% include 'snippets/book_titleby.html' with book=item_book %} +

    + {% if item_book|book_description %} +
    + {% with full=item_book|book_description trim_length=20 %} + {% include 'snippets/trimmed_text.html' with hide_more=True %} + {% endwith %} + {% endif %} + {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %}
    - -

    - {% include 'snippets/book_titleby.html' %} -

    {% endwith %}
  3. {% endfor %} -
  4. +
  5. {% include "book/suggestion_list/search.html" %}
@@ -61,6 +72,6 @@ - + {% endif %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 804e71037..383672053 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -80,50 +80,8 @@ {% endwith %} + {% include "lists/list_item_notes.html" with item=item %} - {% if item.notes %} -
- -
-
-
- {% url 'user-feed' item.user|username as user_path %} - {% blocktrans trimmed with username=item.user.display_name %} - {{ username }} says: - {% endblocktrans %} -
- {{ item.notes|to_markdown|safe }} -
- {% if item.user == request.user %} -
-
- - - {% trans "Edit notes" %} - - - - {% include "lists/edit_item_form.html" with book=item.book %} -
-
- {% endif %} -
-
- {% elif item.user == request.user %} -
-
- - - {% trans "Add notes" %} - - - - {% include "lists/edit_item_form.html" with book=item.book %} -
-
- {% endif %}