From 403e282d888da9ad02a1a5e6da88c190d9f48994 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 28 Nov 2021 21:52:28 +0100
Subject: [PATCH 01/18] Add `aria-describedby` to field help/error messages

---
 bookwyrm/forms.py                             | 43 +++++++++++++++++++
 .../templates/preferences/delete_user.html    |  4 +-
 bookwyrm/templates/preferences/edit_user.html | 22 ++++++----
 bookwyrm/templates/settings/site.html         |  8 ++--
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 847ca05c0..aed5a7945 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -9,6 +9,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from bookwyrm import models
+from bookwyrm.models.fields import ClearableFileInputWithWarning
 
 
 class CustomForm(ModelForm):
@@ -147,6 +148,23 @@ class EditUserForm(CustomForm):
             "preferred_language",
         ]
         help_texts = {f: None for f in fields}
+        widgets = {
+            "avatar": ClearableFileInputWithWarning(
+                attrs={'aria-describedby': "desc_avatar"}
+            ),
+            "name": forms.TextInput(
+                attrs={'aria-describedby': "desc_name"}
+            ),
+            "summary": forms.Textarea(
+                attrs={'aria-describedby': "desc_summary"}
+            ),
+            "email": forms.EmailInput(
+                attrs={'aria-describedby': "desc_email"}
+            ),
+            "discoverable": forms.CheckboxInput(
+                attrs={'aria-describedby': "desc_discoverable"}
+            ),
+        }
 
 
 class LimitedEditUserForm(CustomForm):
@@ -160,6 +178,20 @@ class LimitedEditUserForm(CustomForm):
             "discoverable",
         ]
         help_texts = {f: None for f in fields}
+        widgets = {
+            "avatar": ClearableFileInputWithWarning(
+                attrs={'aria-describedby': "desc_avatar"}
+            ),
+            "name": forms.TextInput(
+                attrs={'aria-describedby': "desc_name"}
+            ),
+            "summary": forms.Textarea(
+                attrs={'aria-describedby': "desc_summary"}
+            ),
+            "discoverable": forms.CheckboxInput(
+                attrs={'aria-describedby': "desc_discoverable"}
+            ),
+        }
 
 
 class DeleteUserForm(CustomForm):
@@ -288,6 +320,17 @@ class SiteForm(CustomForm):
     class Meta:
         model = models.SiteSettings
         exclude = []
+        widgets = {
+            "instance_short_description": forms.TextInput(
+                attrs={'aria-describedby': "desc_instance_short_description"}
+            ),
+            "require_confirm_email": forms.CheckboxInput(
+                attrs={'aria-describedby': "desc_require_confirm_email"}
+            ),
+            "invite_request_text": forms.Textarea(
+                attrs={'aria-describedby': "desc_invite_request_text"}
+            ),
+        }
 
 
 class AnnouncementForm(CustomForm):
diff --git a/bookwyrm/templates/preferences/delete_user.html b/bookwyrm/templates/preferences/delete_user.html
index 63bd2f860..a72cc97d7 100644
--- a/bookwyrm/templates/preferences/delete_user.html
+++ b/bookwyrm/templates/preferences/delete_user.html
@@ -18,9 +18,9 @@
         {% csrf_token %}
         <div class="field">
             <label class="label" for="id_password">{% trans "Confirm password:" %}</label>
-            <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required>
+            <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required aria-describedby="desc_password">
             {% for error in form.password.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
+            <p class="help is-danger" id="desc_password">{{ error | escape }}</p>
             {% endfor %}
         </div>
         <button type="submit" class="button is-danger">{% trans "Delete Account" %}</button>
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 72c49dbe5..a3f8962c8 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -34,7 +34,7 @@
                 <div class="column">
                     {{ form.avatar }}
                     {% for error in form.avatar.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
+                    <p class="help is-danger" id="desc_avatar">{{ error | escape }}</p>
                     {% endfor %}
                 </div>
             </div>
@@ -42,21 +42,21 @@
                 <label class="label" for="id_name">{% trans "Display name:" %}</label>
                 {{ form.name }}
                 {% for error in form.name.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
+                <p class="help is-danger" id="desc_name">{{ error | escape }}</p>
                 {% endfor %}
             </div>
             <div class="field">
                 <label class="label" for="id_summary">{% trans "Summary:" %}</label>
                 {{ form.summary }}
                 {% for error in form.summary.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
+                <p class="help is-danger" id="desc_summary">{{ error | escape }}</p>
                 {% endfor %}
             </div>
             <div class="field">
                 <label class="label" for="id_email">{% trans "Email address:" %}</label>
                 {{ form.email }}
                 {% for error in form.email.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
+                <p class="help is-danger" id="desc_email">{{ error | escape }}</p>
                 {% endfor %}
             </div>
         </div>
@@ -69,19 +69,23 @@
         <div class="box">
             <div class="field">
                 <label class="checkbox label" for="id_show_goal">
-                    {% trans "Show reading goal prompt in feed:" %}
                     {{ form.show_goal }}
+                    {% trans "Show reading goal prompt in feed" %}
                 </label>
+            </div>
+            <div class="field">
                 <label class="checkbox label" for="id_show_suggested_users">
-                    {% trans "Show suggested users:" %}
                     {{ form.show_suggested_users }}
+                    {% trans "Show suggested users" %}
                 </label>
+            </div>
+            <div class="field">
                 <label class="checkbox label" for="id_discoverable">
-                    {% trans "Show this account in suggested users:" %}
                     {{ form.discoverable }}
+                    {% trans "Show this account in suggested users" %}
                 </label>
                 {% url 'directory' as path %}
-                <p class="help">
+                <p class="help" id="desc_discoverable">
                     {% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}
                 </p>
             </div>
@@ -107,8 +111,8 @@
         <div class="box">
             <div class="field">
                 <label class="checkbox label" for="id_manually_approves_followers">
-                    {% trans "Manually approve followers:" %}
                     {{ form.manually_approves_followers }}
+                    {% trans "Manually approve followers" %}
                 </label>
             </div>
             <div class="field">
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 94a4dd454..01b25036b 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -33,8 +33,8 @@
                 {{ site_form.instance_description }}
             </div>
             <div class="field">
-                <label class="label mb-0" for="id_short_description">{% trans "Short description:" %}</label>
-                <p class="help">{% trans "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown." %}</p>
+                <label class="label mb-0" for="id_instance_short_description">{% trans "Short description:" %}</label>
+                <p class="help" id="desc_instance_short_description">{% trans "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown." %}</p>
                 {{ site_form.instance_short_description }}
             </div>
             <div class="field">
@@ -114,7 +114,7 @@
                     {{ site_form.require_confirm_email }}
                     {% trans "Require users to confirm email address" %}
                 </label>
-                <p class="help">{% trans "(Recommended if registration is open)" %}</p>
+                <p class="help" id="desc_require_confirm_email">{% trans "(Recommended if registration is open)" %}</p>
             </div>
             <div class="field">
                 <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
@@ -124,7 +124,7 @@
                 <label class="label" for="id_invite_request_text">{% trans "Invite request text:" %}</label>
                 {{ site_form.invite_request_text }}
                 {% for error in site_form.invite_request_text.errors %}
-                <p class="help is-danger">{{ error|escape }}</p>
+                <p class="help is-danger" id="desc_invite_request_text">{{ error|escape }}</p>
                 {% endfor %}
             </div>
         </div>

From 85c688b1475bf79649f49619d8ab56a3200cd9b7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 28 Nov 2021 22:01:49 +0100
Subject: [PATCH 02/18] Update forms.py

---
 bookwyrm/forms.py | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index aed5a7945..ffbb237b8 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -150,19 +150,13 @@ class EditUserForm(CustomForm):
         help_texts = {f: None for f in fields}
         widgets = {
             "avatar": ClearableFileInputWithWarning(
-                attrs={'aria-describedby': "desc_avatar"}
-            ),
-            "name": forms.TextInput(
-                attrs={'aria-describedby': "desc_name"}
-            ),
-            "summary": forms.Textarea(
-                attrs={'aria-describedby': "desc_summary"}
-            ),
-            "email": forms.EmailInput(
-                attrs={'aria-describedby': "desc_email"}
+                attrs={"aria-describedby": "desc_avatar"}
             ),
+            "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+            "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}),
+            "email": forms.EmailInput(attrs={"aria-describedby": "desc_email"}),
             "discoverable": forms.CheckboxInput(
-                attrs={'aria-describedby': "desc_discoverable"}
+                attrs={"aria-describedby": "desc_discoverable"}
             ),
         }
 
@@ -180,16 +174,12 @@ class LimitedEditUserForm(CustomForm):
         help_texts = {f: None for f in fields}
         widgets = {
             "avatar": ClearableFileInputWithWarning(
-                attrs={'aria-describedby': "desc_avatar"}
-            ),
-            "name": forms.TextInput(
-                attrs={'aria-describedby': "desc_name"}
-            ),
-            "summary": forms.Textarea(
-                attrs={'aria-describedby': "desc_summary"}
+                attrs={"aria-describedby": "desc_avatar"}
             ),
+            "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+            "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}),
             "discoverable": forms.CheckboxInput(
-                attrs={'aria-describedby': "desc_discoverable"}
+                attrs={"aria-describedby": "desc_discoverable"}
             ),
         }
 
@@ -322,13 +312,13 @@ class SiteForm(CustomForm):
         exclude = []
         widgets = {
             "instance_short_description": forms.TextInput(
-                attrs={'aria-describedby': "desc_instance_short_description"}
+                attrs={"aria-describedby": "desc_instance_short_description"}
             ),
             "require_confirm_email": forms.CheckboxInput(
-                attrs={'aria-describedby': "desc_require_confirm_email"}
+                attrs={"aria-describedby": "desc_require_confirm_email"}
             ),
             "invite_request_text": forms.Textarea(
-                attrs={'aria-describedby': "desc_invite_request_text"}
+                attrs={"aria-describedby": "desc_invite_request_text"}
             ),
         }
 

From dd0114c64468b84323aa7cc7526baee683ca07b5 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 22:33:03 +0100
Subject: [PATCH 03/18] Include errors display snippet

---
 .../templates/preferences/delete_user.html    |  5 ++---
 bookwyrm/templates/preferences/edit_user.html | 20 ++++++++-----------
 bookwyrm/templates/settings/site.html         |  5 ++---
 bookwyrm/templates/snippets/form_errors.html  |  9 +++++++++
 4 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/form_errors.html

diff --git a/bookwyrm/templates/preferences/delete_user.html b/bookwyrm/templates/preferences/delete_user.html
index a72cc97d7..b009230c5 100644
--- a/bookwyrm/templates/preferences/delete_user.html
+++ b/bookwyrm/templates/preferences/delete_user.html
@@ -19,9 +19,8 @@
         <div class="field">
             <label class="label" for="id_password">{% trans "Confirm password:" %}</label>
             <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required aria-describedby="desc_password">
-            {% for error in form.password.errors %}
-            <p class="help is-danger" id="desc_password">{{ error | escape }}</p>
-            {% endfor %}
+
+            {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}    
         </div>
         <button type="submit" class="button is-danger">{% trans "Delete Account" %}</button>
     </form>
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index a3f8962c8..b18eb4e98 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -33,31 +33,27 @@
                 {% endif %}
                 <div class="column">
                     {{ form.avatar }}
-                    {% for error in form.avatar.errors %}
-                    <p class="help is-danger" id="desc_avatar">{{ error | escape }}</p>
-                    {% endfor %}
+
+                    {% include 'snippets/form_errors.html' with errors_list=form.avatar.errors id="desc_avatar" %}    
                 </div>
             </div>
             <div class="field">
                 <label class="label" for="id_name">{% trans "Display name:" %}</label>
                 {{ form.name }}
-                {% for error in form.name.errors %}
-                <p class="help is-danger" id="desc_name">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}    
             </div>
             <div class="field">
                 <label class="label" for="id_summary">{% trans "Summary:" %}</label>
                 {{ form.summary }}
-                {% for error in form.summary.errors %}
-                <p class="help is-danger" id="desc_summary">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.summary.errors id="desc_summary" %}    
             </div>
             <div class="field">
                 <label class="label" for="id_email">{% trans "Email address:" %}</label>
                 {{ form.email }}
-                {% for error in form.email.errors %}
-                <p class="help is-danger" id="desc_email">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.email.errors id="desc_email" %}    
             </div>
         </div>
     </section>
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 01b25036b..3c05e1473 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -123,9 +123,8 @@
             <div class="field">
                 <label class="label" for="id_invite_request_text">{% trans "Invite request text:" %}</label>
                 {{ site_form.invite_request_text }}
-                {% for error in site_form.invite_request_text.errors %}
-                <p class="help is-danger" id="desc_invite_request_text">{{ error|escape }}</p>
-                {% endfor %}
+    
+                {% include 'snippets/form_errors.html' with errors_list=site_form.invite_request_text.errors id="desc_invite_request_text" %}    
             </div>
         </div>
     </section>
diff --git a/bookwyrm/templates/snippets/form_errors.html b/bookwyrm/templates/snippets/form_errors.html
new file mode 100644
index 000000000..ecbf7ff8d
--- /dev/null
+++ b/bookwyrm/templates/snippets/form_errors.html
@@ -0,0 +1,9 @@
+{% if errors_list %}
+<div id="{{ id }}">
+    {% for error in errors_list %}
+    <p class="help is-danger">
+        {{ error | escape }}
+    </p>
+    {% endfor %}
+</div>
+{% endif %}

From 28f0882ba61dec1f41748d7e0ea9477ae1f71168 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 22:39:01 +0100
Subject: [PATCH 04/18] Handle Author form errors

---
 bookwyrm/forms.py                          | 34 ++++++++++++++-
 bookwyrm/templates/author/edit_author.html | 50 +++++++++-------------
 2 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ffbb237b8..88820c8f1 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -236,7 +236,39 @@ class AuthorForm(CustomForm):
             "librarything_key",
             "goodreads_key",
         ]
-
+        widgets = {
+            "name": forms.TextInput(
+                attrs={"aria-describedby": "desc_name"}
+            ),
+            "aliases": forms.TextInput(
+                attrs={"aria-describedby": "desc_aliases"}
+            ),
+            "bio": forms.Textarea(
+                attrs={"aria-describedby": "desc_bio"}
+            ),
+            "wikipedia_link": forms.TextInput(
+                attrs={"aria-describedby": "desc_wikipedia_link"}
+            ),
+            "born": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_born"}
+            ),
+            "died": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_died"}
+            ),
+            "oepnlibrary_key": forms.TextInput(
+                attrs={"aria-describedby": "desc_oepnlibrary_key"}
+            ),
+            "inventaire_id": forms.TextInput(
+                attrs={"aria-describedby": "desc_inventaire_id"}
+            ),
+            "librarything_key": forms.TextInput(
+                attrs={"aria-describedby": "desc_librarything_key"}
+            ),
+            "goodreads_key": forms.TextInput(
+                attrs={"aria-describedby": "desc_goodreads_key"}
+            ),
+        }
+        
 
 class ImportForm(forms.Form):
     csv_file = forms.FileField()
diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html
index 54d7f4f1c..de1a7875e 100644
--- a/bookwyrm/templates/author/edit_author.html
+++ b/bookwyrm/templates/author/edit_author.html
@@ -34,47 +34,41 @@
             <div class="field">
                 <label class="label" for="id_name">{% trans "Name:" %}</label>
                 {{ form.name }}
-                {% for error in form.name.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}    
             </div>
 
             <div class="field">
                 <label class="label" for="id_aliases">{% trans "Aliases:" %}</label>
                 {{ form.aliases }}
                 <span class="help">{% trans "Separate multiple values with commas." %}</span>
-                {% for error in form.aliases.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% 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 }}
-                {% for error in form.bio.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% 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>
-            {% for error in form.wikipedia_link.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+
+            {% 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">
-                {% for error in form.born.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% 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">
-                {% for error in form.died.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.died.errors id="desc_died" %}    
             </div>
         </div>
         <div class="column">
@@ -82,33 +76,29 @@
             <div class="field">
                 <label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label>
                 {{ form.openlibrary_key }}
-                {% for error in form.openlibrary_key.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% 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 }}
-                {% for error in form.inventaire_id.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% 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 }}
-                {% for error in form.librarything_key.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% 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 }}
-                {% for error in form.goodreads_key.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=form.goodreads_key.errors id="desc_goodreads_key" %}    
             </div>
 
         </div>

From adb0d356a8d81ed63c64e74befa9a4ac9dcfea76 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 22:39:44 +0100
Subject: [PATCH 05/18] Update site.html

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

diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 3c05e1473..8efad308d 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -124,7 +124,7 @@
                 <label class="label" for="id_invite_request_text">{% trans "Invite request text:" %}</label>
                 {{ site_form.invite_request_text }}
     
-                {% include 'snippets/form_errors.html' with errors_list=site_form.invite_request_text.errors id="desc_invite_request_text" %}    
+                {% include 'snippets/form_errors.html' with errors_list=site_form.invite_request_text.errors id="desc_invite_request_text" %}
             </div>
         </div>
     </section>

From c2873c601f4deb2efa05af166fe49c9a373479af Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:26:25 +0100
Subject: [PATCH 06/18] Register form

---
 .../templates/snippets/register_form.html     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/snippets/register_form.html b/bookwyrm/templates/snippets/register_form.html
index 9e610bd13..a1af78eff 100644
--- a/bookwyrm/templates/snippets/register_form.html
+++ b/bookwyrm/templates/snippets/register_form.html
@@ -3,32 +3,31 @@
 <div class="field">
     <label class="label" for="id_localname_register">{% trans "Username:" %}</label>
     <div class="control">
-        <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname_register" value="{% if register_form.localname.value %}{{ register_form.localname.value }}{% endif %}">
+        <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname_register" value="{% if register_form.localname.value %}{{ register_form.localname.value }}{% endif %}" aria-describedby="desc_localname_register">
+        
+        {% include 'snippets/form_errors.html' with errors_list=register_form.localname.errors id="desc_localname_register" %}
     </div>
-    {% for error in register_form.localname.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
 </div>
 <div class="field">
     <label class="label" for="id_email_register">{% trans "Email address:" %}</label>
     <div class="control">
-        <input type="email" name="email" maxlength="254" class="input" id="id_email_register" value="{% if register_form.email.value %}{{ register_form.email.value }}{% endif %}" required>
-    {% for error in register_form.email.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
+        <input type="email" name="email" maxlength="254" class="input" id="id_email_register" value="{% if register_form.email.value %}{{ register_form.email.value }}{% endif %}" required aria-describedby="desc_email_register">
+
+        {% include 'snippets/form_errors.html' with errors_list=register_form.email.errors id="desc_email_register" %}
     </div>
 </div>
 <div class="field">
     <label class="label" for="id_password_register">{% trans "Password:" %}</label>
     <div class="control">
-        <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_register">
-    {% for error in register_form.password.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
+        <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_register" aria-describedby="desc_password_register">
+        
+        {% include 'snippets/form_errors.html' with errors_list=register_form.password.errors id="desc_password_register" %}
     </div>
 </div>
 <div class="field is-grouped">
     <div class="control">
-        <button class="button is-primary" type="submit">{% trans "Sign Up" %}</button>
+        <button class="button is-primary" type="submit">
+            {% trans "Sign Up" %}
+        </button>
     </div>
 </div>

From 08b4c538e621f0ba979f94aeefa89064a304d5e7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:26:43 +0100
Subject: [PATCH 07/18] User moderation actions

---
 .../users/user_moderation_actions.html        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/settings/users/user_moderation_actions.html b/bookwyrm/templates/settings/users/user_moderation_actions.html
index a976359f4..b5f69529f 100644
--- a/bookwyrm/templates/settings/users/user_moderation_actions.html
+++ b/bookwyrm/templates/settings/users/user_moderation_actions.html
@@ -50,18 +50,23 @@
             {% endif %}
             {% with group=user.groups.first %}
             <div class="select">
-                <select name="groups" id="id_user_group">
+                <select name="groups" id="id_user_group" aria-describedby="desc_user_group">
                     {% for value, name in group_form.fields.groups.choices %}
-                    <option value="{{ value }}" {% if name == group.name %}selected{% endif %}>{{ name|title }}</option>
+                    <option value="{{ value }}" {% if name == group.name %}selected{% endif %}>
+                        {{ name|title }}
+                    </option>
                     {% endfor %}
-                    <option value="" {% if not group %}selected{% endif %}>User</option>
+                    <option value="" {% if not group %}selected{% endif %}>
+                        User
+                    </option>
                 </select>
             </div>
-            {% for error in group_form.groups.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+
+            {% include 'snippets/form_errors.html' with errors_list=group_form.groups.errors id="desc_user_group" %}
             {% endwith %}
-            <button class="button">{% trans "Save" %}</button>
+            <button class="button">
+                {% trans "Save" %}
+            </button>
         </form>
     </div>
     {% endif %}

From a154597de179d76f491499a06c72db430db198f1 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:26:53 +0100
Subject: [PATCH 08/18] Delete user form

---
 bookwyrm/templates/settings/users/delete_user_form.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/settings/users/delete_user_form.html b/bookwyrm/templates/settings/users/delete_user_form.html
index 158745d05..1ea63269d 100644
--- a/bookwyrm/templates/settings/users/delete_user_form.html
+++ b/bookwyrm/templates/settings/users/delete_user_form.html
@@ -15,10 +15,9 @@
     </p>
     <div class="field">
         <label class="label" for="id_password">{% trans "Your password:" %}</label>
-        <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required>
-        {% for error in form.password.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
+        <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required aria-describedby="desc_password">
+
+        {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}
     </div>
     <button type="submit" class="button is-danger">{% trans "Delete Account" %}</button>
 </form>

From 0a621550b8863d7dda304864f09a12b4e0248baf Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:27:04 +0100
Subject: [PATCH 09/18] IP address form

---
 .../settings/ip_blocklist/ip_address_form.html         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html b/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
index c8a4c3e74..4a776987f 100644
--- a/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
+++ b/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
@@ -20,16 +20,16 @@
     </div>
 
     <div class="field">
-        <input type="text" name="address" maxlength="255" class="input" required="" id="id_address" placeholder="190.0.2.0/24">
+        <input type="text" name="address" maxlength="255" class="input" required="" id="id_address" placeholder="190.0.2.0/24" aria-describedby="desc_address">
     </div>
 
-    {% for error in form.address.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
+    {% include 'snippets/form_errors.html' with errors_list=form.address.errors id="desc_address" %}
 
     <div class="field">
         <div class="control">
-            <button type="submit" class="button is-primary">{% trans "Add" %}</button>
+            <button type="submit" class="button is-primary">
+                {% trans "Add" %}
+            </button>
         </div>
     </div>
 </form>

From 5d0c6bdde24d9964848826bdf12f5683145655d6 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:27:25 +0100
Subject: [PATCH 10/18] Edit instance form

---
 .../settings/federation/edit_instance.html    | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/templates/settings/federation/edit_instance.html b/bookwyrm/templates/settings/federation/edit_instance.html
index 7c2e6be66..0a67895cc 100644
--- a/bookwyrm/templates/settings/federation/edit_instance.html
+++ b/bookwyrm/templates/settings/federation/edit_instance.html
@@ -27,11 +27,12 @@
     <div class="columns">
         <div class="column is-half">
             <div class="field">
-                <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
-                <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
-                {% for error in form.server_name.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <label class="label" for="id_server_name">
+                    {% trans "Instance:" %}
+                </label>
+                <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com" aria-describedby="desc_server_name">
+                
+                {% include 'snippets/form_errors.html' with errors_list=form.server_name.errors id="desc_server_name" %}
             </div>
         </div>
         <div class="column is-half">
@@ -49,29 +50,37 @@
     <div class="columns">
         <div class="column is-half">
             <div class="field">
-                <label class="label" for="id_application_type">{% trans "Software:" %}</label>
-                <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
-                {% for error in form.application_type.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <label class="label" for="id_application_type">
+                    {% trans "Software:" %}
+                </label>
+                <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}" aria-describedby="desc_application_type">
+                
+                {% include 'snippets/form_errors.html' with errors_list=form.application_type.errors id="desc_application_type" %}
             </div>
         </div>
         <div class="column is-half">
             <div class="field">
-                <label class="label" for="id_application_version">{% trans "Version:" %}</label>
-                <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
-                {% for error in form.application_version.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <label class="label" for="id_application_version">
+                    {% trans "Version:" %}
+                </label>
+                <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}" aria-describedby="desc_application_version">
+                
+                {% include 'snippets/form_errors.html' with errors_list=form.application_version.errors id="desc_application_version" %}
             </div>
         </div>
     </div>
     <div class="field">
-        <label class="label" for="id_notes">{% trans "Notes:" %}</label>
-        <textarea name="notes" cols="40" rows="5" class="textarea" id="id_notes">{{ form.notes.value|default:'' }}</textarea>
+        <label class="label" for="id_notes">
+            {% trans "Notes:" %}
+        </label>
+        <textarea name="notes" cols="40" rows="5" class="textarea" id="id_notes">
+            {{ form.notes.value|default:'' }}
+        </textarea>
     </div>
 
-    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+    <button type="submit" class="button is-primary">
+        {% trans "Save" %}
+    </button>
 </form>
 
 {% endblock %}

From a6760cabc86d99b23bda32e36464a4a913aa7c3c Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:28:29 +0100
Subject: [PATCH 11/18] Email domain form

---
 bookwyrm/forms.py                                            | 5 +++++
 bookwyrm/templates/settings/email_blocklist/domain_form.html | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 88820c8f1..ddb02d937 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -383,6 +383,11 @@ class EmailBlocklistForm(CustomForm):
     class Meta:
         model = models.EmailBlocklist
         fields = ["domain"]
+        widgets = {
+            "avatar": forms.TextInput(
+                attrs={'aria-describedby': "desc_domain"}
+            ),
+        }
 
 
 class IPBlocklistForm(CustomForm):
diff --git a/bookwyrm/templates/settings/email_blocklist/domain_form.html b/bookwyrm/templates/settings/email_blocklist/domain_form.html
index e93337495..cebc97c85 100644
--- a/bookwyrm/templates/settings/email_blocklist/domain_form.html
+++ b/bookwyrm/templates/settings/email_blocklist/domain_form.html
@@ -17,10 +17,8 @@
             {{ form.domain }}
         </div>
     </div>
-    {% for error in form.domain.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
 
+    {% include 'snippets/form_errors.html' with errors_list=form.domain.errors id="desc_domain" %}
     <div class="field">
         <div class="control">
             <button type="submit" class="button is-primary">{% trans "Add" %}</button>

From 659d13d0a60e80ac17e28ba2c41a295fb2b73422 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:28:51 +0100
Subject: [PATCH 12/18] Announcement form

---
 bookwyrm/forms.py                             | 20 +++++++
 .../announcements/announcement_form.html      | 58 +++++++++++--------
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ddb02d937..e8136a54f 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -359,6 +359,26 @@ class AnnouncementForm(CustomForm):
     class Meta:
         model = models.Announcement
         exclude = ["remote_id"]
+        widgets = {
+            "preview": forms.TextInput(
+                attrs={"aria-describedby": "desc_preview"}
+            ),
+            "content": forms.Textarea(
+                attrs={"aria-describedby": "desc_content"}
+            ),
+            "event_date": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_event_date"}
+            ),
+            "start_date": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_start_date"}
+            ),
+            "end_date": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_end_date"}
+            ),
+            "active": forms.CheckboxInput(
+                attrs={"aria-describedby": "desc_active"}
+            ),
+        }
 
 
 class ListForm(CustomForm):
diff --git a/bookwyrm/templates/settings/announcements/announcement_form.html b/bookwyrm/templates/settings/announcements/announcement_form.html
index ffdbfc2fd..8f68e2555 100644
--- a/bookwyrm/templates/settings/announcements/announcement_form.html
+++ b/bookwyrm/templates/settings/announcements/announcement_form.html
@@ -13,60 +13,68 @@
 {% csrf_token %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <p>
-    <label class="label" for="id_preview">{% trans "Preview:" %}</label>
+    <label class="label" for="id_preview">
+        {% trans "Preview:" %}
+    </label>
     {{ form.preview }}
-    {% for error in form.preview.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
+    
+    {% include 'snippets/form_errors.html' with errors_list=form.preview.errors id="desc_preview" %}
 </p>
 <p>
-    <label class="label" for="id_content">{% trans "Content:" %}</label>
+    <label class="label" for="id_content">
+        {% trans "Content:" %}
+    </label>
     {{ form.content }}
-    {% for error in form.content.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
+    
+    {% include 'snippets/form_errors.html' with errors_list=form.content.errors id="desc_content" %}
 </p>
 <p>
-    <label class="label" for="id_event_date">{% trans "Event date:" %}</label>
+    <label class="label" for="id_event_date">
+        {% trans "Event date:" %}
+    </label>
     <input type="date" name="event_date" value="{{ form.event_date.value|date:'Y-m-d' }}" class="input" id="id_event_date">
-    {% for error in form.event_date.errors %}
-    <p class="help is-danger">{{ error | escape }}</p>
-    {% endfor %}
+    
+    {% include 'snippets/form_errors.html' with errors_list=form.event_date.errors id="desc_event_date" %}
 </p>
 <hr aria-hidden="true">
 <div class="columns">
     <div class="column">
         <p>
-            <label class="label" for="id_start_date">{% trans "Start date:" %}</label>
+            <label class="label" for="id_start_date">
+                {% trans "Start date:" %}
+            </label>
             <input type="date" name="start_date" class="input" value="{{ form.start_date.value|date:'Y-m-d' }}" id="id_start_date">
-            {% for error in form.start_date.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            
+            {% include 'snippets/form_errors.html' with errors_list=form.start_date.errors id="desc_start_date" %}
         </p>
     </div>
     <div class="column">
         <p>
-            <label class="label" for="id_end_date">{% trans "End date:" %}</label>
+            <label class="label" for="id_end_date">
+                {% trans "End date:" %}
+            </label>
             <input type="date" name="end_date" class="input" id="id_end_date" value="{{ form.end_date.value|date:'Y-m-d' }}">
-            {% for error in form.end_date.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            
+            {% include 'snippets/form_errors.html' with errors_list=form.end_date.errors id="desc_end_date" %}
         </p>
     </div>
     <div class="column is-narrow">
         <p>
-            <label class="label" for="id_active">{% trans "Active:" %}</label>
+            <label class="label" for="id_active">
+                {% trans "Active:" %}
+            </label>
             {{ form.active }}
-            {% for error in form.active.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            
+            {% include 'snippets/form_errors.html' with errors_list=form.active.errors id="desc_active" %}
         </p>
     </div>
 </div>
 
 <div class="field has-addons">
     <div class="control">
-        <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+        <button type="submit" class="button is-primary">
+            {% trans "Save" %}
+        </button>
     </div>
 </div>
 {% endblock %}

From 63d31b8623d5eb084b049b5acbf8ae0a91da8408 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:29:22 +0100
Subject: [PATCH 13/18] Edit book form

---
 bookwyrm/forms.py                             |  61 ++++-
 .../templates/book/edit/edit_book_form.html   | 229 ++++++++++--------
 2 files changed, 194 insertions(+), 96 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index e8136a54f..3f46be348 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -218,6 +218,65 @@ class EditionForm(CustomForm):
             "connector",
             "search_vector",
         ]
+        widgets = {
+            "title": forms.TextInput(
+                attrs={"aria-describedby": "desc_title"}
+            ),
+            "subtitle": forms.TextInput(
+                attrs={"aria-describedby": "desc_subtitle"}
+            ),
+            "description": forms.Textarea(
+                attrs={"aria-describedby": "desc_description"}
+            ),
+            "series": forms.TextInput(
+                attrs={"aria-describedby": "desc_series"}
+            ),
+            "series_number": forms.TextInput(
+                attrs={"aria-describedby": "desc_series_number"}
+            ),
+            "languages": forms.TextInput(
+                attrs={"aria-describedby": "desc_languages_help desc_languages"}
+            ),
+            "publishers": forms.TextInput(
+                attrs={"aria-describedby": "desc_publishers_help desc_publishers"}
+            ),
+            "first_published_date": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_first_published_date"}
+            ),
+            "published_date": forms.SelectDateWidget(
+                attrs={"aria-describedby": "desc_published_date"}
+            ),
+            "cover": ClearableFileInputWithWarning(
+                attrs={"aria-describedby": "desc_cover"}
+            ),
+            "physical_format": forms.Select(
+                attrs={"aria-describedby": "desc_physical_format"}
+            ),
+            "physical_format_detail": forms.TextInput(
+                attrs={"aria-describedby": "desc_physical_format_detail"}
+            ),
+            "pages": forms.NumberInput(
+                attrs={"aria-describedby": "desc_pages"}
+            ),
+            "isbn_13": forms.TextInput(
+                attrs={"aria-describedby": "desc_isbn_13"}
+            ),
+            "isbn_10": forms.TextInput(
+                attrs={"aria-describedby": "desc_isbn_10"}
+            ),
+            "openlibrary_key": forms.TextInput(
+                attrs={"aria-describedby": "desc_openlibrary_key"}
+            ),
+            "inventaire_id": forms.TextInput(
+                attrs={"aria-describedby": "desc_inventaire_id"}
+            ),
+            "oclc_number": forms.TextInput(
+                attrs={"aria-describedby": "desc_oclc_number"}
+            ),
+            "ASIN": forms.TextInput(
+                attrs={"aria-describedby": "desc_ASIN"}
+            ),
+        }
 
 
 class AuthorForm(CustomForm):
@@ -268,7 +327,7 @@ class AuthorForm(CustomForm):
                 attrs={"aria-describedby": "desc_goodreads_key"}
             ),
         }
-        
+
 
 class ImportForm(forms.Form):
     csv_file = forms.FileField()
diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html
index 982bb56d2..feebb803c 100644
--- a/bookwyrm/templates/book/edit/edit_book_form.html
+++ b/bookwyrm/templates/book/edit/edit_book_form.html
@@ -12,106 +12,125 @@
 <div class="columns">
     <div class="column is-half">
         <section class="block">
-            <h2 class="title is-4">{% trans "Metadata" %}</h2>
+            <h2 class="title is-4">
+                {% trans "Metadata" %}
+            </h2>
             <div class="box">
                 <div class="field">
-                    <label class="label" for="id_title">{% trans "Title:" %}</label>
-                    <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title">
-                    {% for error in form.title.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    <label class="label" for="id_title">
+                        {% trans "Title:" %}
+                    </label>
+                    <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title" aria-describedby="desc_title">
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.title.errors id="desc_title" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label>
-                    <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle">
-                    {% for error in form.subtitle.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    <label class="label" for="id_subtitle">
+                        {% trans "Subtitle:" %}
+                    </label>
+                    <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle" aria-describedby="desc_subtitle">
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.subtitle.errors id="desc_subtitle" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_description">{% trans "Description:" %}</label>
+                    <label class="label" for="id_description">
+                        {% trans "Description:" %}
+                    </label>
                     {{ form.description }}
-                    {% for error in form.description.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.description.errors id="desc_description" %}
                 </div>
 
                 <div class="columns">
                     <div class="column is-two-thirds">
                         <div class="field">
-                            <label class="label" for="id_series">{% trans "Series:" %}</label>
-                            <input type="text" class="input" name="series" id="id_series" value="{{ form.series.value|default:'' }}">
-                            {% for error in form.series.errors %}
-                            <p class="help is-danger">{{ error | escape }}</p>
-                            {% endfor %}
+                            <label class="label" for="id_series">
+                                {% trans "Series:" %}
+                            </label>
+                            <input type="text" class="input" name="series" id="id_series" value="{{ form.series.value|default:'' }}" aria-describedby="desc_series">
+                            
+                            {% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %}
                         </div>
                     </div>
                     <div class="column is-one-third">
                         <div class="field">
-                            <label class="label" for="id_series_number">{% trans "Series number:" %}</label>
+                            <label class="label" for="id_series_number">
+                                {% trans "Series number:" %}
+                            </label>
                             {{ form.series_number }}
-                            {% for error in form.series_number.errors %}
-                            <p class="help is-danger">{{ error | escape }}</p>
-                            {% endfor %}
+                            
+                            {% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %}
                         </div>
                     </div>
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_languages">{% trans "Languages:" %}</label>
+                    <label class="label" for="id_languages">
+                        {% trans "Languages:" %}
+                    </label>
                     {{ form.languages }}
-                    <span class="help">{% trans "Separate multiple values with commas." %}</span>
-                    {% for error in form.languages.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    <span class="help" id="desc_languages_help">
+                        {% trans "Separate multiple values with commas." %}
+                    </span>
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.languages.errors id="desc_languages" %}
                 </div>
             </div>
         </section>
 
         <section class="block">
-            <h2 class="title is-4">{% trans "Publication" %}</h2>
+            <h2 class="title is-4">
+                {% trans "Publication" %}
+            </h2>
             <div class="box">
                 <div class="field">
-                    <label class="label" for="id_publishers">{% trans "Publisher:" %}</label>
+                    <label class="label" for="id_publishers">
+                        {% trans "Publisher:" %}
+                    </label>
                     {{ form.publishers }}
-                    <span class="help">{% trans "Separate multiple values with commas." %}</span>
-                    {% for error in form.publishers.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    <span class="help" id="desc_publishers_help">
+                        {% trans "Separate multiple values with commas." %}
+                    </span>
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.publishers.errors id="desc_publishers" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
-                    {% for error in form.first_published_date.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    <label class="label" for="id_first_published_date">
+                        {% trans "First published date:" %}
+                    </label>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %} aria-describedby="desc_first_published_date">
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.first_published_date.errors id="desc_first_published_date" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
-                    {% for error in form.published_date.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    <label class="label" for="id_published_date">
+                        {% trans "Published date:" %}
+                    </label>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %} aria-describedby="desc_published_date">
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.published_date.errors id="desc_published_date" %}
                 </div>
             </div>
         </section>
 
         <section class="block">
-            <h2 class="title is-4">{% trans "Authors" %}</h2>
+            <h2 class="title is-4">
+                {% trans "Authors" %}
+            </h2>
             <div class="box">
                 {% if book.authors.exists %}
                 <fieldset>
                     {% for author in book.authors.all %}
                     <div class="is-flex is-justify-content-space-between">
                         <label class="label mb-2">
-                            <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %}>
+                            <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %} aria-describedby="desc_remove_author_{{author.id}}">
                             {% blocktrans with name=author.name %}Remove {{ name }}{% endblocktrans %}
                         </label>
-                        <p class="help">
+                        <p class="help" id="desc_remove_author_{{author.id}}">
                             <a href="{{ author.local_path }}">{% blocktrans with name=author.name %}Author page for {{ name }}{% endblocktrans %}</a>
                         </p>
                     </div>
@@ -119,9 +138,13 @@
                 </fieldset>
                 {% endif %}
                 <div class="field">
-                    <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
-                    <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
-                    <span class="help">{% trans "Separate multiple values with commas." %}</span>
+                    <label class="label" for="id_add_author">
+                        {% trans "Add Authors:" %}
+                    </label>
+                    <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %} aria-describedby="desc_add_author">
+                    <span class="help" id="desc_add_author">
+                        {% trans "Separate multiple values with commas." %}
+                    </span>
                 </div>
             </div>
         </section>
@@ -129,7 +152,9 @@
 
     <div class="column is-half">
         <section class="block">
-            <h2 class="title is-4">{% trans "Cover" %}</h2>
+            <h2 class="title is-4">
+                {% trans "Cover" %}
+            </h2>
             <div class="box">
                 <div class="columns">
                     {% if book.cover %}
@@ -140,108 +165,122 @@
 
                     <div class="column">
                         <div class="field">
-                            <label class="label" for="id_cover">{% trans "Upload cover:" %}</label>
+                            <label class="label" for="id_cover">
+                                {% trans "Upload cover:" %}
+                            </label>
                             {{ form.cover }}
                         </div>
                         <div class="field">
                             <label class="label" for="id_cover_url">
                                 {% trans "Load cover from url:" %}
                             </label>
-                            <input class="input" name="cover-url" id="id_cover_url" type="url" value="{{ cover_url|default:'' }}">
+                            <input class="input" name="cover-url" id="id_cover_url" type="url" value="{{ cover_url|default:'' }}" aria-describedby="desc_cover">
                         </div>
-                        {% for error in form.cover.errors %}
-                        <p class="help is-danger">{{ error | escape }}</p>
-                        {% endfor %}
+                        
+                        {% include 'snippets/form_errors.html' with errors_list=form.cover.errors id="desc_cover" %}
                     </div>
                 </div>
             </div>
         </section>
 
         <section class="block">
-            <h2 class="title is-4">{% trans "Physical Properties" %}</h2>
+            <h2 class="title is-4">
+                {% trans "Physical Properties" %}
+            </h2>
             <div class="box">
                 <div class="columns">
                     <div class="column is-one-third">
                         <div class="field">
-                            <label class="label" for="id_physical_format">{% trans "Format:" %}</label>
+                            <label class="label" for="id_physical_format">
+                                {% trans "Format:" %}
+                            </label>
                             <div class="select">
                                 {{ form.physical_format }}
                             </div>
-                            {% for error in form.physical_format.errors %}
-                            <p class="help is-danger">{{ error | escape }}</p>
-                            {% endfor %}
+                            
+                            {% include 'snippets/form_errors.html' with errors_list=form.physical_format.errors id="desc_physical_format" %}
                         </div>
                     </div>
                     <div class="column">
                         <div class="field">
-                            <label class="label" for="id_physical_format_detail">{% trans "Format details:" %}</label>
+                            <label class="label" for="id_physical_format_detail">
+                                {% trans "Format details:" %}
+                            </label>
                             {{ form.physical_format_detail }}
-                            {% for error in form.physical_format_detail.errors %}
-                            <p class="help is-danger">{{ error | escape }}</p>
-                            {% endfor %}
+                            
+                            {% include 'snippets/form_errors.html' with errors_list=form.physical_format_detail.errors id="desc_physical_format_detail" %}
                         </div>
                     </div>
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_pages">{% trans "Pages:" %}</label>
+                    <label class="label" for="id_pages">
+                        {% trans "Pages:" %}
+                    </label>
                     {{ form.pages }}
-                    {% for error in form.pages.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.pages.errors id="desc_pages" %}
                 </div>
             </div>
         </section>
 
         <section class="block">
-            <h2 class="title is-4">{% trans "Book Identifiers" %}</h2>
+            <h2 class="title is-4">
+                {% trans "Book Identifiers" %}
+            </h2>
             <div class="box">
                 <div class="field">
-                    <label class="label" for="id_isbn_13">{% trans "ISBN 13:" %}</label>
+                    <label class="label" for="id_isbn_13">
+                        {% trans "ISBN 13:" %}
+                    </label>
                     {{ form.isbn_13 }}
-                    {% for error in form.isbn_13.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.isbn_13.errors id="desc_isbn_13" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label>
+                    <label class="label" for="id_isbn_10">
+                        {% trans "ISBN 10:" %}
+                    </label>
                     {{ form.isbn_10 }}
-                    {% for error in form.isbn_10.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.isbn_10.errors id="desc_isbn_10" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_openlibrary_key">{% trans "Openlibrary ID:" %}</label>
+                    <label class="label" for="id_openlibrary_key">
+                        {% trans "Openlibrary ID:" %}
+                    </label>
                     {{ form.openlibrary_key }}
-                    {% for error in form.openlibrary_key.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.openlibrary_key.errors id="desc_openlibrary_key" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label>
+                    <label class="label" for="id_inventaire_id">
+                        {% trans "Inventaire ID:" %}
+                    </label>
                     {{ form.inventaire_id }}
-                    {% for error in form.inventaire_id.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% 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_oclc_number">{% trans "OCLC Number:" %}</label>
+                    <label class="label" for="id_oclc_number">
+                        {% trans "OCLC Number:" %}
+                    </label>
                     {{ form.oclc_number }}
-                    {% for error in form.oclc_number.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.oclc_number.errors id="desc_oclc_number" %}
                 </div>
 
                 <div class="field">
-                    <label class="label" for="id_asin">{% trans "ASIN:" %}</label>
+                    <label class="label" for="id_asin">
+                        {% trans "ASIN:" %}
+                    </label>
                     {{ form.asin }}
-                    {% for error in form.ASIN.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+                    
+                    {% include 'snippets/form_errors.html' with errors_list=form.ASIN.errors id="desc_ASIN" %}
                 </div>
             </div>
         </section>

From 3eb4dfdc9be1cb4bc8b7e7ce718a030fa9ce4985 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:29:36 +0100
Subject: [PATCH 14/18] Get started user form

---
 bookwyrm/templates/get_started/profile.html | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html
index 90cdb4104..ef33afac2 100644
--- a/bookwyrm/templates/get_started/profile.html
+++ b/bookwyrm/templates/get_started/profile.html
@@ -14,16 +14,14 @@
                 <div class="block">
                     <label class="label" for="id_name">{% trans "Display name:" %}</label>
                     <input type="text" name="name" maxlength="100" class="input" id="id_name" placeholder="{{ user.localname }}" value="{% if request.user.name %}{{ request.user.name }}{% endif %}">
-                    {% for error in form.name.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+
+                    {% include 'snippets/form_errors.html' with errors_list=form.name.errors id="desc_name" %}
                 </div>
                 <div class="block">
                     <label class="label" for="id_summary">{% trans "Summary:" %}</label>
                     <textarea name="summary" cols="None" rows="None" class="textarea" id="id_summary" placeholder="{% trans 'A little bit about you' %}">{% if request.user.summary %}{{ request.user.summary }}{% endif %}</textarea>
-                    {% for error in form.summary.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+
+                    {% include 'snippets/form_errors.html' with errors_list=form.summary.errors id="desc_summary" %}
                 </div>
             </div>
 
@@ -31,9 +29,8 @@
                 <div class="block">
                     <label class="label" for="id_avatar">{% trans "Avatar:" %}</label>
                     {{ form.avatar }}
-                    {% for error in form.avatar.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+
+                    {% include 'snippets/form_errors.html' with errors_list=form.avatar.errors id="desc_avatar" %}
                 </div>
             </div>
         </div>

From 3cf9660df30f4eec6f4779029ce33cbf3752bf0f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:29:56 +0100
Subject: [PATCH 15/18] Login form

---
 bookwyrm/templates/landing/layout.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/landing/layout.html b/bookwyrm/templates/landing/layout.html
index 0d6f231c1..56985768f 100644
--- a/bookwyrm/templates/landing/layout.html
+++ b/bookwyrm/templates/landing/layout.html
@@ -65,10 +65,9 @@
                         {% csrf_token %}
                         <div class="block">
                             <label for="id_request_email" class="label">{% trans "Email address:" %}</label>
-                            <input type="email" name="email" maxlength="255" class="input" required="" id="id_request_email">
-                            {% for error in request_form.email.errors %}
-                            <p class="help is-danger">{{ error|escape }}</p>
-                            {% endfor %}
+                            <input type="email" name="email" maxlength="255" class="input" required="" id="id_request_email" aria-describedby="desc_request_email">
+
+                            {% include 'snippets/form_errors.html' with errors_list=request_form.email.errors id="desc_request_email" %}
                         </div>
                         <button type="submit" class="button is-link">{% trans "Submit" %}</button>
                     </form>

From 80535a3b0caee396b82ca39207a4d03e251c9174 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:30:14 +0100
Subject: [PATCH 16/18] Login form

---
 bookwyrm/templates/landing/login.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/landing/login.html b/bookwyrm/templates/landing/login.html
index 95baa06de..c9ac25261 100644
--- a/bookwyrm/templates/landing/login.html
+++ b/bookwyrm/templates/landing/login.html
@@ -26,11 +26,10 @@
             <div class="field">
                 <label class="label" for="id_password_confirm">{% trans "Password:" %}</label>
                 <div class="control">
-                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_confirm">
+                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_confirm" aria-describedby="desc_password">
                 </div>
-                {% for error in login_form.password.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+
+                {% include 'snippets/form_errors.html' with errors_list=login_form.password.errors id="desc_password" %}
             </div>
             <div class="field is-grouped">
                 <div class="control">

From 43072a357f2f100907dafc608f9319444dc16f48 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:30:23 +0100
Subject: [PATCH 17/18] Password reset form

---
 .../templates/landing/password_reset.html     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/landing/password_reset.html b/bookwyrm/templates/landing/password_reset.html
index be1dccf81..8348efd4f 100644
--- a/bookwyrm/templates/landing/password_reset.html
+++ b/bookwyrm/templates/landing/password_reset.html
@@ -8,21 +8,33 @@
     <div class="column">
         <div class="block">
             <h1 class="title">{% trans "Reset Password" %}</h1>
-            {% for error in errors %}
-            <p class="is-danger">{{ error }}</p>
-            {% endfor %}
+
+            {% if errors %}
+            <div id="form_errors">
+                {% for error in errors %}
+                <p class="is-danger">
+                    {{ error }}
+                </p>
+                {% endfor %}
+            </div>
+
+            {% endif %}
             <form name="password-reset" method="post" action="/password-reset/{{ code }}">
                 {% csrf_token %}
                 <div class="field">
-                    <label class="label" for="id_new_password">{% trans "Password:" %}</label>
+                    <label class="label" for="id_new_password">
+                        {% trans "Password:" %}
+                    </label>
                     <div class="control">
-                        <input type="password" name="password" maxlength="128" class="input" required="" id="id_new_password">
+                        <input type="password" name="password" maxlength="128" class="input" required="" id="id_new_password" aria-describedby="form_errors">
                     </div>
                 </div>
                 <div class="field">
-                    <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
+                    <label class="label" for="id_confirm_password">
+                        {% trans "Confirm password:" %}
+                    </label>
                     <div class="control">
-                        <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
+                        <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password" aria-describedby="form_errors">
                     </div>
                 </div>
                 <div class="field is-grouped">

From 4d93545d885400cc6370e2410b5311d1502e2dd5 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 29 Nov 2021 23:31:05 +0100
Subject: [PATCH 18/18] Lint forms

---
 bookwyrm/forms.py | 64 ++++++++++++-----------------------------------
 1 file changed, 16 insertions(+), 48 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 3f46be348..aff1e29cb 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -219,18 +219,12 @@ class EditionForm(CustomForm):
             "search_vector",
         ]
         widgets = {
-            "title": forms.TextInput(
-                attrs={"aria-describedby": "desc_title"}
-            ),
-            "subtitle": forms.TextInput(
-                attrs={"aria-describedby": "desc_subtitle"}
-            ),
+            "title": forms.TextInput(attrs={"aria-describedby": "desc_title"}),
+            "subtitle": forms.TextInput(attrs={"aria-describedby": "desc_subtitle"}),
             "description": forms.Textarea(
                 attrs={"aria-describedby": "desc_description"}
             ),
-            "series": forms.TextInput(
-                attrs={"aria-describedby": "desc_series"}
-            ),
+            "series": forms.TextInput(attrs={"aria-describedby": "desc_series"}),
             "series_number": forms.TextInput(
                 attrs={"aria-describedby": "desc_series_number"}
             ),
@@ -255,15 +249,9 @@ class EditionForm(CustomForm):
             "physical_format_detail": forms.TextInput(
                 attrs={"aria-describedby": "desc_physical_format_detail"}
             ),
-            "pages": forms.NumberInput(
-                attrs={"aria-describedby": "desc_pages"}
-            ),
-            "isbn_13": forms.TextInput(
-                attrs={"aria-describedby": "desc_isbn_13"}
-            ),
-            "isbn_10": forms.TextInput(
-                attrs={"aria-describedby": "desc_isbn_10"}
-            ),
+            "pages": forms.NumberInput(attrs={"aria-describedby": "desc_pages"}),
+            "isbn_13": forms.TextInput(attrs={"aria-describedby": "desc_isbn_13"}),
+            "isbn_10": forms.TextInput(attrs={"aria-describedby": "desc_isbn_10"}),
             "openlibrary_key": forms.TextInput(
                 attrs={"aria-describedby": "desc_openlibrary_key"}
             ),
@@ -273,9 +261,7 @@ class EditionForm(CustomForm):
             "oclc_number": forms.TextInput(
                 attrs={"aria-describedby": "desc_oclc_number"}
             ),
-            "ASIN": forms.TextInput(
-                attrs={"aria-describedby": "desc_ASIN"}
-            ),
+            "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}),
         }
 
 
@@ -296,24 +282,14 @@ class AuthorForm(CustomForm):
             "goodreads_key",
         ]
         widgets = {
-            "name": forms.TextInput(
-                attrs={"aria-describedby": "desc_name"}
-            ),
-            "aliases": forms.TextInput(
-                attrs={"aria-describedby": "desc_aliases"}
-            ),
-            "bio": forms.Textarea(
-                attrs={"aria-describedby": "desc_bio"}
-            ),
+            "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+            "aliases": forms.TextInput(attrs={"aria-describedby": "desc_aliases"}),
+            "bio": forms.Textarea(attrs={"aria-describedby": "desc_bio"}),
             "wikipedia_link": forms.TextInput(
                 attrs={"aria-describedby": "desc_wikipedia_link"}
             ),
-            "born": forms.SelectDateWidget(
-                attrs={"aria-describedby": "desc_born"}
-            ),
-            "died": forms.SelectDateWidget(
-                attrs={"aria-describedby": "desc_died"}
-            ),
+            "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}),
+            "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}),
             "oepnlibrary_key": forms.TextInput(
                 attrs={"aria-describedby": "desc_oepnlibrary_key"}
             ),
@@ -419,12 +395,8 @@ class AnnouncementForm(CustomForm):
         model = models.Announcement
         exclude = ["remote_id"]
         widgets = {
-            "preview": forms.TextInput(
-                attrs={"aria-describedby": "desc_preview"}
-            ),
-            "content": forms.Textarea(
-                attrs={"aria-describedby": "desc_content"}
-            ),
+            "preview": forms.TextInput(attrs={"aria-describedby": "desc_preview"}),
+            "content": forms.Textarea(attrs={"aria-describedby": "desc_content"}),
             "event_date": forms.SelectDateWidget(
                 attrs={"aria-describedby": "desc_event_date"}
             ),
@@ -434,9 +406,7 @@ class AnnouncementForm(CustomForm):
             "end_date": forms.SelectDateWidget(
                 attrs={"aria-describedby": "desc_end_date"}
             ),
-            "active": forms.CheckboxInput(
-                attrs={"aria-describedby": "desc_active"}
-            ),
+            "active": forms.CheckboxInput(attrs={"aria-describedby": "desc_active"}),
         }
 
 
@@ -463,9 +433,7 @@ class EmailBlocklistForm(CustomForm):
         model = models.EmailBlocklist
         fields = ["domain"]
         widgets = {
-            "avatar": forms.TextInput(
-                attrs={'aria-describedby': "desc_domain"}
-            ),
+            "avatar": forms.TextInput(attrs={"aria-describedby": "desc_domain"}),
         }