Merge pull request #1095 from bookwyrm-social/display-fixes

Display fixes

bookwyrm/templates/book/book.html

@@ -194,7 +194,7 @@
             {% endif %}
             <div class="block" id="reviews">
                 {% if request.user.is_authenticated %}
-                {% if user_statuses.review_count or user_statuses.comment_count or user_stuatses.quotation_count %}
+                {% if user_statuses.review_count or user_statuses.comment_count or user_statuses.quotation_count %}
                 <nav class="tabs">
                     <ul>
                         {% url 'book' book.id as tab_url %}
@@ -224,46 +224,26 @@
                 {% endif %}
                 {% endif %}
 
-                {% for review in statuses %}
+                {% for status in statuses %}
                     <div
                         class="block"
+                        {% if status.status_type == 'Review' or status.status_type == 'Rating' %}
                         itemprop="review"
                         itemscope
                         itemtype="https://schema.org/Review"
+                        {% endif %}
                     >
-                        {% with status=review hide_book=True depth=1 %}
+                        {% include 'snippets/status/status.html' with status=status hide_book=True depth=1 %}
-                            {% include 'snippets/status/status.html' %}
-                        {% endwith %}
                     </div>
                 {% endfor %}
 
+                {% if ratings %}
                 <div class="block is-flex is-flex-wrap-wrap">
                     {% for rating in ratings %}
-                        {% with user=rating.user %}
+                        {% include 'book/rating.html' with user=rating.user rating=rating %}
-                            <div class="block mr-5">
-                                <div class="media">
-                                    <div class="media-left">
-                                        {% include 'snippets/avatar.html' %}
-                                    </div>
-
-                                    <div class="media-content">
-                                        <div>
-                                            <a href="{{ user.local_path }}">{{ user.display_name }}</a>
-                                        </div>
-                                        <div class="is-flex">
-                                            <p class="mr-1">{% trans "rated it" %}</p>
-
-                                            {% include 'snippets/stars.html' with rating=rating.rating %}
-                                        </div>
-                                        <div>
-                                            <a href="{{ rating.remote_id }}">{{ rating.published_date|naturaltime }}</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endwith %}
                     {% endfor %}
                 </div>
+                {% endif %}
                 <div class="block">
                     {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
                 </div>

bookwyrm/templates/book/rating.html

@@ -0,0 +1,22 @@
+{% load i18n %}{% load status_display %}
+<div class="block mr-5">
+    <div class="media">
+        <div class="media-left">
+            {% include 'snippets/avatar.html' with user=user %}
+        </div>
+
+        <div class="media-content">
+            <div>
+                <a href="{{ user.local_path }}">{{ user.display_name }}</a>
+            </div>
+            <div class="is-flex">
+                <p class="mr-1">{% trans "rated it" %}</p>
+
+                {% include 'snippets/stars.html' with rating=rating.rating %}
+            </div>
+            <div>
+                <a href="{{ rating.remote_id }}">{{ rating.published_date|published_date }}</a>
+            </div>
+        </div>
+    </div>
+</div>

bookwyrm/templates/lists/list.html

@@ -51,9 +51,9 @@
                                 <p>
                                     {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
                                 </p>
-                                <p>
+                                <div>
                                     {{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}
-                                </p>
+                                </div>
                                 {% include 'snippets/shelve_button/shelve_button.html' %}
                             </div>
                         </div>

bookwyrm/templates/lists/list_items.html

@@ -22,7 +22,7 @@
             {% endwith %}
 
             <div class="card-content is-flex-grow-0">
-                <div {% if list.description %}title="{{ list.description }}"{% endif %}>
+                <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
                 {% if list.description %}
                     {{ list.description|to_markdown|safe|truncatechars_html:30 }}
                 {% else %}

bookwyrm/templates/login.html

@@ -38,6 +38,9 @@
                 </div>
             </form>
         </div>
+    </div>
+
+    <div class="column">
         <div class="box has-background-primary-light">
             {% if site.allow_registration %}
             <h2 class="title">{% trans "Create an Account" %}</h2>
@@ -50,15 +53,15 @@
             {% endif %}
         </div>
     </div>
+</div>
 
-    <div class="column">
+<div class="block">
-        <div class="block">
+    <div class="box">
-            {% include 'snippets/about.html' %}
+        {% include 'snippets/about.html' %}
 
-            <p class="block">
+        <p class="block">
-            <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
+        <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
-            </p>
+        </p>
-        </div>
     </div>
 </div>
 {% endblock %}

bookwyrm/templates/search/book.html

@@ -7,7 +7,7 @@
 {% with results|first as local_results %}
 <ul class="block">
 {% for result in local_results.results %}
-    <li class="pd-4">
+    <li class="pd-4 mb-5">
         {% include 'snippets/search_result_text.html' with result=result %}
     </li>
 {% endfor %}

bookwyrm/tests/views/test_book.py

@@ -59,7 +59,6 @@ class BookViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get("")
         with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.book.id)

bookwyrm/views/books.py

@@ -30,6 +30,7 @@ class Book(View):
 
     def get(self, request, book_id, user_statuses=False):
         """info about a book"""
+        user_statuses = user_statuses if request.user.is_authenticated else False
         try:
             book = models.Book.objects.select_subclasses().get(id=book_id)
         except models.Book.DoesNotExist:
@@ -51,9 +52,9 @@ class Book(View):
         )
 
         # the reviews to show
-        if user_statuses and request.user.is_authenticated:
+        if user_statuses:
             if user_statuses == "review":
-                queryset = book.review_set
+                queryset = book.review_set.select_subclasses()
             elif user_statuses == "comment":
                 queryset = book.comment_set
             else:
@@ -67,7 +68,9 @@ class Book(View):
             "book": book,
             "statuses": paginated.get_page(request.GET.get("page")),
             "review_count": reviews.count(),
-            "ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
+            "ratings": reviews.filter(Q(content__isnull=True) | Q(content=""))
+            if not user_statuses
+            else None,
             "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
             "lists": privacy_filter(
                 request.user, book.list_set.filter(listitem__approved=True)