Editable announcement

bookwyrm/templates/book/book_identifiers.html

@@ -1,5 +1,4 @@
 {% spaceless %}
-
 {% load i18n %}
 
 <dl>

bookwyrm/templates/settings/announcement.html

@@ -1,22 +1,59 @@
 {% extends 'settings/admin_layout.html' %}
-{% load i18n %}
+{% load i18n %}{% load humanize %}
 {% block title %}{% trans "Announcement" %} - {{ announcement.preview }}{% endblock %}
 
-{% block header %}{% trans "Announcement" %}{% endblock %}
+{% block header %}
+{% trans "Announcement" %}
+<a href="{% url 'settings-announcements' %}" class="has-text-weight-normal help">{% trans "Back to list" %}</a>
+{% endblock %}
 
 {% block edit-button %}
 {% trans "Edit Announcement" as button_text %}
-{% include 'snippets/toggle/open_button.html' with controls_text="create-announcement" icon_with_text="plus" text=button_text focus="create-announcement-header" %}
+{% include 'snippets/toggle/open_button.html' with controls_text="edit-announcement" icon_with_text="plus" text=button_text focus="edit-announcement-header" %}
 </a>
 {% endblock %}
 
 {% block panel %}
 
-<div class="block">
+<form name="edit-announcement" method="post" action="{% url 'settings-announcements' announcement.id %}" class="block">
-    {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
+    {% include 'settings/announcement_form.html' with controls_text="edit-announcement" %}
-</div>
+</form>
 
 <div class="block content">
+    <dl>
+        <div class="is-flex notification pt-1 pb-1 mb-0 {% if announcement in active_announcements %}is-success{% else %}is-danger{% endif %}">
+            <dt class="mr-1 has-text-weight-bold">{% trans "Visible:" %}</dt>
+            <dd>
+                {% if announcement in active_announcements %}
+                {% trans "True" %}
+                {% else %}
+                {% trans "False" %}
+                {% endif %}
+            </dd>
+        </div>
+
+        {% if announcement.start_date %}
+        <div class="is-flex notificationi pt-1 pb-1 mb-0 has-background-white">
+            <dt class="mr-1 has-text-weight-bold">{% trans "Start date:" %}</dt>
+            <dd>{{ announcement.start_date|naturalday }}</dd>
+        </div>
+        {% endif %}
+
+        {% if announcement.end_date %}
+        <div class="is-flex notification pt-1 pb-1 mb-0 has-background-white">
+            <dt class="mr-1 has-text-weight-bold">{% trans "End date:" %}</dt>
+            <dd>{{ announcement.end_date|naturalday }}</dd>
+        </div>
+        {% endif %}
+
+        <div class="is-flex notification pt-1 pb-1 has-background-white">
+            <dt class="mr-1 has-text-weight-bold">{% trans "Active:" %}</dt>
+            <dd>{{ announcement.active }}</dd>
+        </div>
+    </dl>
+
+    <hr aria-hidden="true">
+
     {% include 'snippets/announcement.html' with announcement=announcement pressed=True %}
 </div>
 

bookwyrm/templates/settings/announcement_form.html

@@ -6,8 +6,6 @@
 {% endblock %}
 
 {% block form %}
-<form name="create-announcement" method="post" action="{% url 'settings-announcements' %}">
-<form name="create-announcement" method="post" action="/settings/announcements">
 {% csrf_token %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <p>
@@ -67,6 +65,4 @@
         <button type="submit" class="button is-primary">{% trans "Save" %}</button>
     </div>
 </div>
-</form>
 {% endblock %}
-

bookwyrm/templates/settings/announcements.html

@@ -11,9 +11,9 @@
 {% endblock %}
 
 {% block panel %}
-<div class="block">
+<form name="create-announcement" method="post" action="{% url 'settings-announcements' %}" class="block">
     {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
-</div>
+</form>
 
 <table class="table is-striped">
     <tr>

bookwyrm/templates/settings/federated_server.html

@@ -10,7 +10,7 @@
 {% if server.status == "blocked" %}<span class="icon icon-x has-text-danger is-size-5" title="{% trans 'Blocked' %}"><span class="is-sr-only">{% trans "Blocked" %}</span></span>
 {% endif %}
 
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to list" %}</a>
 {% endblock %}
 
 {% block panel %}

bookwyrm/views/announcements.py

@@ -61,9 +61,9 @@ class Announcement(View):
         announcement = get_object_or_404(models.Announcement, id=announcement_id)
         form = forms.AnnouncementForm(request.POST, instance=announcement)
         if form.is_valid():
-            form.save()
+            announcement = form.save()
         data = {
-            "announcements": models.Announcement.objects.all(),
+            "announcement": announcement,
             "form": form,
         }
         return TemplateResponse(request, "settings/announcement.html", data)