From 3eeeb78bd7b73fa289821f1a0e28901605e07a66 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 28 Sep 2020 18:25:05 -0700 Subject: [PATCH] Fixes UI for statuses --- bookwyrm/models/status.py | 2 +- bookwyrm/static/css/format.css | 2 +- bookwyrm/templates/feed.html | 4 +-- bookwyrm/templates/snippets/book_titleby.html | 4 +-- bookwyrm/templates/snippets/interaction.html | 19 +++++++---- bookwyrm/templates/snippets/status.html | 33 ++++++++++--------- .../templates/snippets/status_content.html | 30 ++++++++--------- .../templates/snippets/status_header.html | 22 ++++++------- 8 files changed, 61 insertions(+), 55 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index eb79e43d..f7d924b9 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -214,7 +214,7 @@ class Boost(Status): ActivityMapping('object', 'boosted_status'), ] - activity_serializer = activitypub.Like + activity_serializer = activitypub.Boost # This constraint can't work as it would cross tables. # class Meta: diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css index 65c5f6f2..617d9391 100644 --- a/bookwyrm/static/css/format.css +++ b/bookwyrm/static/css/format.css @@ -31,7 +31,7 @@ input.toggle-control { display: none; } -.toggle-content.hidden { +.hidden { display: none; } diff --git a/bookwyrm/templates/feed.html b/bookwyrm/templates/feed.html index 1cd96cbe..2afef2f3 100644 --- a/bookwyrm/templates/feed.html +++ b/bookwyrm/templates/feed.html @@ -5,8 +5,8 @@
{% for activity in activities %} -
- {% include 'snippets/status.html' with status=activity %} +
+ {% include 'snippets/status.html' with status=activity %}
{% endfor %} diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html index 543c64c5..d8b84646 100644 --- a/bookwyrm/templates/snippets/book_titleby.html +++ b/bookwyrm/templates/snippets/book_titleby.html @@ -1,8 +1,8 @@ - + {{ book.title }} {% if book.authors %} - + by {% include 'snippets/authors.html' with book=book %} {% endif %} diff --git a/bookwyrm/templates/snippets/interaction.html b/bookwyrm/templates/snippets/interaction.html index ca546ccf..7f0033ed 100644 --- a/bookwyrm/templates/snippets/interaction.html +++ b/bookwyrm/templates/snippets/interaction.html @@ -1,20 +1,22 @@ {% load fr_display %} -
+
{% if request.user.is_authenticated %}
+
{% csrf_token %} - +
{% csrf_token %} -
+
+ + Public post + +
diff --git a/bookwyrm/templates/snippets/status.html b/bookwyrm/templates/snippets/status.html index 3f7c7c59..599b33ca 100644 --- a/bookwyrm/templates/snippets/status.html +++ b/bookwyrm/templates/snippets/status.html @@ -1,23 +1,24 @@ {% load fr_display %} -
-

- {% if status.boosted_status %} - {% include 'snippets/status_header.html' with status=status.boosted_status %} - {% include 'snippets/status_header.html' with status=status %} - {% else %} - {% include 'snippets/status_header.html' with status=status %} - {% endif %} -

-
+
+
+ {% include 'snippets/status_header.html' with status=status %} +
+ +
+ {% if status.status_type == 'Boost' %} + {% include 'snippets/status_content.html' with status=status.boosted_status %} + {% else %} {% include 'snippets/status_content.html' with status=status %} + {% endif %}
+
+ {% if status.status_type == 'Boost' %} + {% include 'snippets/interaction.html' with activity=status.boosted_status %} + {% else %} + {% include 'snippets/interaction.html' with activity=status %} + {% endif %} +
-{% if status.status_type == 'Boost' %} -{% include 'snippets/interaction.html' with activity=status|boosted_status %} -{% else %} -{% include 'snippets/interaction.html' with activity=status %} -{% endif %} - diff --git a/bookwyrm/templates/snippets/status_content.html b/bookwyrm/templates/snippets/status_content.html index be7d8935..3f526424 100644 --- a/bookwyrm/templates/snippets/status_content.html +++ b/bookwyrm/templates/snippets/status_content.html @@ -3,32 +3,26 @@
{% if not hide_book and status.mention_books.count %}
- {% for book in status.mention_books.all|slice:"0:4" %} + {% for book in status.mention_books.all|slice:"0:4" %}
-
- {% include 'snippets/book_cover.html' with book=book %} - {% if status.mention_books.count > 1 %} -

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

- {% endif %} - {% include 'snippets/rate_action.html' with book=book user=request.user %} - {% include 'snippets/shelve_button.html' with book=book %} -
- {% if status.mention_books.count == 1 %} -
-

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

- {% include 'snippets/book_description.html' with book=book %} -
+ {% include 'snippets/book_cover.html' with book=book %} + {% if status.mention_books.count > 1 %} +

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

{% endif %} + {% include 'snippets/rate_action.html' with book=book user=request.user %} + {% include 'snippets/shelve_button.html' with book=book %}
- {% endfor %} + {% endfor %}
{% endif %} {% if not hide_book and status.book %}
+
{% include 'snippets/book_cover.html' with book=status.book %} {% include 'snippets/rate_action.html' with book=status.book user=request.user %} {% include 'snippets/shelve_button.html' with book=status.book %} +
{% endif %} @@ -48,10 +42,14 @@
{% endif %} - {% if status.content and status.status_type != 'Update' and status.status_type != 'Boost' %} + {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
{{ status.content | safe }}
{% endif %} + {% if status.mention_books.count == 1 and not status.book %} + {% include 'snippets/book_description.html' with book=status.mention_books.first %} + {% endif %} + {% if not status.content and status.book and not hide_book and status.status_type != 'Boost' %} {% include 'snippets/book_description.html' with book=status.book %} {% endif %} diff --git a/bookwyrm/templates/snippets/status_header.html b/bookwyrm/templates/snippets/status_header.html index 5043be43..c38eff7d 100644 --- a/bookwyrm/templates/snippets/status_header.html +++ b/bookwyrm/templates/snippets/status_header.html @@ -1,12 +1,14 @@ {% load humanize %} {% load fr_display %} -
-
+
+

{% include 'snippets/avatar.html' with user=status.user %} {% include 'snippets/username.html' with user=status.user %} - {% if status.status_type == 'Update' %} - {{ status.content | safe }} + {% if status.status_type == 'GeneratedNote' %} + {{ status.content | safe }} {% include 'snippets/book_titleby.html' with book=status.mention_books.first %} + {% elif status.status_type == 'Boost' %} + boosted {% include 'snippets/avatar.html' with user=status.boosted_status.user %}{% include 'snippets/username.html' with user=status.boosted_status.user possessive=True %} status {% elif status.status_type == 'Review' and not status.name and not status.content%} rated {{ status.book.title }} {% elif status.status_type == 'Review' %} @@ -15,17 +17,15 @@ commented on {{ status.book.title }} {% elif status.status_type == 'Quotation' %} quoted {{ status.book.title }} - {% elif status.status_type == 'Boost' %} - boosted {% elif status.reply_parent %} {% with parent_status=status|parent %} - replied to {% include 'snippets/username.html' with user=parent_status.user possessive=True %} {{ parent_status.status_type | lower }} + replied to {% include 'snippets/username.html' with user=parent_status.user possessive=True %} {% if parent_status.status_type == 'GeneratedNote' %}update{% else %}{{ parent_status.status_type | lower }}{% endif %} {% endwith %} {% endif %} -

+

-
-