From 6b5bebdf781e067e97683507639343d35e6ade45 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 26 Feb 2022 10:44:50 -0800
Subject: [PATCH] Cleans up scheduler form

---
 bookwyrm/forms.py                             |  5 ++++
 .../templates/settings/automod/rules.html     | 28 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 00e6d5d8..561a86d0 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -563,3 +563,8 @@ class IntervalScheduleForm(CustomForm):
     class Meta:
         model = IntervalSchedule
         fields = ["every", "period"]
+
+        widgets = {
+            "every": forms.NumberInput(attrs={"aria-describedby": "desc_every"}),
+            "period": forms.Select(attrs={"aria-describedby": "desc_period"}),
+        }
diff --git a/bookwyrm/templates/settings/automod/rules.html b/bookwyrm/templates/settings/automod/rules.html
index 0a1b1c3f..ef0a49be 100644
--- a/bookwyrm/templates/settings/automod/rules.html
+++ b/bookwyrm/templates/settings/automod/rules.html
@@ -18,8 +18,10 @@
         {% trans "Auto-moderation rules will create reports for any local user or status with fields matching the provided string." %}
         {% trans "Users or statuses that have already been reported (regardless of whether the report was resolved) will not be flagged." %}
     </p>
+</div>
+<div class="box block">
     {% if task %}
-    <dl>
+    <dl class="block">
         <dt class="is-pulled-left mr-5 has-text-weight-bold">
             {% trans "Schedule:" %}
         </dt>
@@ -51,7 +53,7 @@
         </dd>
     </dl>
 
-    <div class="is-flex is-justify-content-space-between">
+    <div class="is-flex is-justify-content-space-between block">
         <form name="unschedule-scan" method="POST" action="{% url 'settings-automod-unschedule' task.id %}">
             {% csrf_token %}
             <button class="button is-danger">{% trans "Delete schedule" %}</button>
@@ -64,9 +66,29 @@
     </div>
 
     {% else %}
+    <h2 class="title is-4">{% trans "Schedule scan" %}</h2>
     <form name="schedule-scan" method="POST" action="{% url 'settings-automod-schedule' %}">
         {% csrf_token %}
-        {{ task_form.as_p }}
+        <div class="field">
+            <label class="label" for="id_every">
+                {{ task_form.every.label }}
+            </label>
+            {{ task_form.every }}
+            <p class="help" id="desc_every">
+                {{ task_form.every.help_text }}
+            </p>
+        </div>
+        <div class="field">
+            <label class="label" for="id_period">
+            {{ task_form.period.label }}
+            </label>
+            <div class="select">
+                {{ task_form.period }}
+            </div>
+            <p class="help" id="desc_period">
+                {{ task_form.period.help_text }}
+            </p>
+        </div>
         <button class="button is-warning">{% trans "Schedule scan" %}</button>
     </form>
     {% endif %}