Merge pull request #702 from mouse-reeve/book-page-display

Book page display

bookwyrm/activitypub/book.py

@@ -26,7 +26,7 @@ class Book(ActivityObject):
     librarythingKey: str = ''
     goodreadsKey: str = ''
 
-    cover: Image = field(default_factory=lambda: {})
+    cover: Image = None
     type: str = 'Book'
 
 

bookwyrm/templates/book.html

@@ -35,7 +35,7 @@
     </div>
 
     <div class="columns">
-        <div class="column is-narrow">
+        <div class="column is-one-fifth">
             {% include 'snippets/book_cover.html' with book=book size=large %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
             {% include 'snippets/shelve_button/shelve_button.html' %}
@@ -93,7 +93,7 @@
             </section>
         </div>
 
-        <div class="column">
+        <div class="column is-three-fifths">
             <div class="block">
                 <h3 class="field is-grouped">
                     {% include 'snippets/stars.html' with rating=rating %}
@@ -201,7 +201,7 @@
             </div>
 
         </div>
-        <div class="column is-narrow">
+        <div class="column is-one-fifth">
             {% if book.subjects %}
             <section class="content block">
                 <h2 class="title is-5">{% trans "Subjects" %}</h2>
@@ -217,7 +217,7 @@
             <section class="content block">
                 <h2 class="title is-5">{% trans "Places" %}</h2>
                 <ul>
-                {% for place in book.subject_placess %}
+                {% for place in book.subject_places %}
                     <li>{{ place }}</li>
                 {% endfor %}
                 </ul>
@@ -254,8 +254,8 @@
                     <div>
                         {% include 'snippets/username.html' with user=rating.user %}
                     </div>
-                    <div class="field is-grouped mb-0">
-                        <div>{% trans "rated it" %}</div>
+                    <div class="is-flex">
+                        <p class="mr-1">{% trans "rated it" %}</p>
                         {% include 'snippets/stars.html' with rating=rating.rating %}
                     </div>
                     <div>

bookwyrm/templates/layout.html

@@ -79,7 +79,7 @@
                     aria-controls="navbar-dropdown"
                 >
                     {% include 'snippets/avatar.html' with user=request.user %}
-                    {% include 'snippets/username.html' with user=request.user anchor=false %}
+                    <span class="ml-2">{% include 'snippets/username.html' with user=request.user anchor=false %}</span>
                 </a>
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>

bookwyrm/templates/snippets/book_cover.html

@@ -6,8 +6,7 @@
     <div class="no-cover book-cover">
         <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">
         <div>
-            <p>{{ book.title }}</p>
-            <p>({{ book.edition_info }})</p>
+            <p>{{ book.alt_text }}</p>
         </div>
     </div>
 {% endif %}

bookwyrm/templates/snippets/readthrough.html

@@ -67,4 +67,4 @@
         </div>
     </form>
 </div>
-{% include 'snippets/delete_readthrough_modal.html' with controls_text="delete-readthrough" controls_uid=readthrough.id %}
+{% include 'snippets/delete_readthrough_modal.html' with controls_text="delete-readthrough" controls_uid=readthrough.id no_body=True %}

bookwyrm/templates/snippets/username.html

@@ -1,9 +1,7 @@
 {% spaceless %}
 {% load bookwyrm_tags %}
 
-<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}
-    class="user ml-1"
->
+<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}>
     {{ user.display_name }}
 </a>
 

bookwyrm/tests/actions/__init__.py

@@ -1 +0,0 @@
-from . import *