From 5f10ccd9c7cb0f953b197bc5239515c5d33b0fa0 Mon Sep 17 00:00:00 2001
From: Olof Pettersson <olof.pettersson.ardehed@gmail.com>
Date: Wed, 1 Dec 2021 14:18:28 +0100
Subject: [PATCH 1/3] Comment out trailing block ending

For people installing an instance with only the reverse proxy server, the hidden trailing `}` at the end of the second server block is quite hard to catch and it took me a good while to figure it out. Having the entire server commented out makes the whole process more understandable in my opinion.
---
 nginx/production | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nginx/production b/nginx/production
index 8a13413a..3d9cfa5a 100644
--- a/nginx/production
+++ b/nginx/production
@@ -17,7 +17,8 @@ server {
 
 #     # redirect http to https
 #     return 301 https://your-domain.com$request_uri;
-# }
+}
+
 #
 # server {
 #     listen [::]:443 ssl http2;
@@ -54,7 +55,7 @@ server {
 #     location /static/ {
 #         alias /app/static/;
 #     }
-}
+# }
 
 # Reverse-Proxy server
 # server {

From 68a489dbe0336072f1db02940782c9b7ac326477 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Dec 2021 11:02:36 -0800
Subject: [PATCH 2/3] Add isni to edit author form

---
 bookwyrm/forms.py                          |  1 +
 bookwyrm/templates/author/edit_author.html | 27 ++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 2a4759fb..7ba7bd97 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -293,6 +293,7 @@ class AuthorForm(CustomForm):
             "inventaire_id",
             "librarything_key",
             "goodreads_key",
+            "isni",
         ]
         widgets = {
             "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html
index de1a7875..6f72b870 100644
--- a/bookwyrm/templates/author/edit_author.html
+++ b/bookwyrm/templates/author/edit_author.html
@@ -35,7 +35,7 @@
                 <label class="label" for="id_name">{% trans "Name:" %}</label>
                 {{ form.name }}
 
-                {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}
             </div>
 
             <div class="field">
@@ -43,32 +43,32 @@
                 {{ form.aliases }}
                 <span class="help">{% trans "Separate multiple values with commas." %}</span>
 
-                {% include 'snippets/form_errors.html' with errors_list=form.aliases.errors id="desc_aliases" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.aliases.errors id="desc_aliases" %}
             </div>
 
             <div class="field">
                 <label class="label" for="id_bio">{% trans "Bio:" %}</label>
                 {{ form.bio }}
 
-                {% include 'snippets/form_errors.html' with errors_list=form.bio.errors id="desc_bio" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.bio.errors id="desc_bio" %}
             </div>
 
             <p class="field"><label class="label" for="id_wikipedia_link">{% trans "Wikipedia link:" %}</label> {{ form.wikipedia_link }}</p>
 
-            {% include 'snippets/form_errors.html' with errors_list=form.wikipedia_link.errors id="desc_wikipedia_link" %}    
+            {% include 'snippets/form_errors.html' with errors_list=form.wikipedia_link.errors id="desc_wikipedia_link" %}
 
             <div class="field">
                 <label class="label" for="id_born">{% trans "Birth date:" %}</label>
                 <input type="date" name="born" value="{{ form.born.value|date:'Y-m-d' }}" class="input" id="id_born">
 
-                {% include 'snippets/form_errors.html' with errors_list=form.born.errors id="desc_born" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.born.errors id="desc_born" %}
             </div>
 
             <div class="field">
                 <label class="label" for="id_died">{% trans "Death date:" %}</label>
                 <input type="date" name="died" value="{{ form.died.value|date:'Y-m-d' }}" class="input" id="id_died">
 
-                {% include 'snippets/form_errors.html' with errors_list=form.died.errors id="desc_died" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.died.errors id="desc_died" %}
             </div>
         </div>
         <div class="column">
@@ -77,28 +77,35 @@
                 <label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label>
                 {{ form.openlibrary_key }}
 
-                {% include 'snippets/form_errors.html' with errors_list=form.oepnlibrary_key.errors id="desc_oepnlibrary_key" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.oepnlibrary_key.errors id="desc_oepnlibrary_key" %}
             </div>
 
             <div class="field">
                 <label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label>
                 {{ form.inventaire_id }}
 
-                {% include 'snippets/form_errors.html' with errors_list=form.inventaire_id.errors id="desc_inventaire_id" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.inventaire_id.errors id="desc_inventaire_id" %}
             </div>
 
             <div class="field">
                 <label class="label" for="id_librarything_key">{% trans "Librarything key:" %}</label>
                 {{ form.librarything_key }}
 
-                {% include 'snippets/form_errors.html' with errors_list=form.librarything_key.errors id="desc_librarything_key" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.librarything_key.errors id="desc_librarything_key" %}
             </div>
 
             <div class="field">
                 <label class="label" for="id_goodreads_key">{% trans "Goodreads key:" %}</label>
                 {{ form.goodreads_key }}
 
-                {% include 'snippets/form_errors.html' with errors_list=form.goodreads_key.errors id="desc_goodreads_key" %}    
+                {% include 'snippets/form_errors.html' with errors_list=form.goodreads_key.errors id="desc_goodreads_key" %}
+            </div>
+
+            <div class="field">
+                <label class="label" for="id_isni">{% trans "ISNI:" %}</label>
+                {{ form.isni }}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.isni.errors id="desc_isni" %}
             </div>
 
         </div>

From c9216fe14ed5ba2dd73a3f26a5d80fac1aa6c3ad Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Dec 2021 13:27:57 -0800
Subject: [PATCH 3/3] Revert "Fixes alignment of search bpx and login form"

This reverts commit 2797386608a756b1fe133ae203a1809f0a7009dc.
---
 bookwyrm/templates/layout.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 88f14c99..f2d04f96 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -32,11 +32,11 @@
 <body>
 <nav class="navbar" aria-label="main navigation">
     <div class="container">
-        <div class="navbar-brand is-align-items-end">
+        <div class="navbar-brand">
             <a class="navbar-item" href="/">
                 <img class="image logo" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" alt="Home page">
             </a>
-            <form class="navbar-item mt-1" action="{% url 'search' %}">
+            <form class="navbar-item column" action="{% url 'search' %}">
                 <div class="field has-addons">
                     <div class="control">
                         {% if user.is_authenticated %}
@@ -159,7 +159,7 @@
                     </a>
                 </div>
                 {% else %}
-                <div class="navbar-item mt-1">
+                <div class="navbar-item">
                     {% if request.path != '/login' and request.path != '/login/' %}
                     <div class="columns">
                         <div class="column">