From 6abe9274c0af2615ccbd75fcda3b101b6f02face Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 15:55:42 -0700
Subject: [PATCH 1/5] Switches out links in the top bar and dropdown

---
 bookwyrm/templates/layout.html | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc6544012..1cf6d4db9 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -55,15 +55,15 @@
         <div class="navbar-menu" id="main-nav">
             <div class="navbar-start">
                 {% if request.user.is_authenticated %}
-                <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
-                    {% trans "Your books" %}
-                </a>
                 <a href="/#feed" class="navbar-item">
                     {% trans "Feed" %}
                 </a>
                 <a href="{% url 'lists' %}" class="navbar-item">
                     {% trans "Lists" %}
                 </a>
+                <a href="{% url 'directory' %}" class="navbar-item">
+                    {% trans "Directory" %}
+                </a>
                 {% endif %}
             </div>
 
@@ -83,21 +83,16 @@
                         <span class="ml-2">{{ request.user.display_name }}</span>
                     </a>
                     <ul class="navbar-dropdown" id="navbar-dropdown">
+                        <li>
+                            <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
+                                {% trans 'Your Books' %}
+                            </a>
+                        </li>
                         <li>
                             <a href="{% url 'direct-messages' %}" class="navbar-item">
                                 {% trans "Direct Messages" %}
                             </a>
                         </li>
-                        <li>
-                            <a href="{% url 'directory' %}" class="navbar-item">
-                                {% trans 'Directory' %}
-                            </a>
-                        </li>
-                        <li>
-                            <a href="{% url 'import' %}" class="navbar-item">
-                                {% trans 'Import Books' %}
-                            </a>
-                        </li>
                         <li>
                             <a href="{% url 'prefs-profile' %}" class="navbar-item">
                                 {% trans 'Settings' %}

From 202c43f610c9ed08383dd61104830c5cc4198c68 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 16:13:17 -0700
Subject: [PATCH 2/5] Adds import option to books page

---
 bookwyrm/templates/user/shelf/shelf.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 639ab502f..48feb873a 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -35,7 +35,9 @@
     {% if is_self %}
     <div class="column is-narrow">
         {% trans "Create shelf" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+
+        <a class="button" href="{% url 'import' %}">{% trans "Import Books" %}</a>
     </div>
     {% endif %}
 </div>

From ca8067769c76a030e779e72817525b80bf4fa338 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 23 May 2021 08:48:00 -0700
Subject: [PATCH 3/5] Don't show deleted ratings in stars

---
 bookwyrm/templatetags/bookwyrm_tags.py | 1 +
 bookwyrm/views/shelf.py                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 3f33643bf..5cba5455f 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -25,6 +25,7 @@ def get_user_rating(book, user):
             user=user,
             book=book,
             rating__isnull=False,
+            deleted=False,
         )
         .order_by("-published_date")
         .first()
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 99e22fa95..538a8e343 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -62,6 +62,7 @@ class Shelf(View):
             user=user,
             rating__isnull=False,
             book__id=OuterRef("id"),
+            deleted=False,
         ).order_by("-published_date")
 
         if not is_self:

From 6e9c9e839c04549f261f7c1524ee788070019564 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 20:25:42 +0200
Subject: [PATCH 4/5] Fix date of death display

---
 bookwyrm/templates/author/author.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 67f8792c9..aa99cbe27 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -39,7 +39,7 @@
                     <dd itemprop="aliases">{{ author.born|naturalday }}</dd>
                 </div>
                 {% endif %}
-                {% if author.aliases %}
+                {% if author.died %}
                 <div class="is-flex">
                     <dt class="mr-1">{% trans "Died:" %}</dt>
                     <dd itemprop="aliases">{{ author.died|naturalday }}</dd>

From f058aa8f1d4ca28b86d08d539232ab609770ed4f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 24 May 2021 06:54:43 -0700
Subject: [PATCH 5/5] Uses correct filter for book title

---
 bookwyrm/templates/book/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index df76d8e11..af2230200 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}
 
-{% block title %}{{ book|title }}{% endblock %}
+{% block title %}{{ book|book_title }}{% endblock %}
 
 {% block content %}
 {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}