zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Don't need both name and preview

Browse source
This commit is contained in:
Mouse Reeve 2021-05-19 15:17:32 -07:00
parent 515d5bb237
commit 346d718265
5 changed files with 29 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

44
bookwyrm/templates/settings/announcement_form.html
View file

@ -10,14 +10,28 @@
<form name="create-announcement" method="post" action="/settings/announcements">
{% csrf_token %}
<input type="hidden" name="user" value="{{ request.user.id }}">
<p>
<label class="label" for="id_name">Name:</label>
{{ form.name }}
{% for error in form.name.errors %}
<label class="label" for="id_preview">Preview:</label>
{{ form.preview }}
{% for error in form.preview.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
</p>
<p>
<label class="label" for="id_content">Content:</label>
{{ form.content }}
{% for error in form.content.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
</p>
<p>
<label class="label" for="id_event_date">Event date:</label>
<input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
{% for error in form.event_date.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
</p>
<hr aria-hidden="true">
<div class="columns">
<div class="column">
<p>
@ -47,28 +61,6 @@
</p>
</div>
</div>
<hr aria-hidden="true">
<p>
<label class="label" for="id_preview">Preview:</label>
{{ form.preview }}
{% for error in form.preview.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
</p>
<p>
<label class="label" for="id_content">Content:</label>
{{ form.content }}
{% for error in form.content.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
</p>
<p>
<label class="label" for="id_event_date">Event date:</label>
<input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
{% for error in form.event_date.errors %}
<p class="help is-danger">{{ error | escape }}</p>
{% endfor %}
</p>
<div class="field has-addons">
<div class="control">

6
bookwyrm/templates/settings/announcements.html
View file

@ -19,8 +19,8 @@
<tr>
{% url 'settings-announcements' as url %}
<th>
{% trans "Name" as text %}
{% include 'snippets/table-sort-header.html' with field="name" sort=sort text=text %}
{% trans "Preview" as text %}
{% include 'snippets/table-sort-header.html' with field="preview" sort=sort text=text %}
</th>
<th>
{% trans "Start date" as text %}
@ -37,7 +37,7 @@
</tr>
{% for announcement in announcements %}
<tr>
<td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.name }}</a></td>
<td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.preview }}</a></td>
<td>{{ announcement.start_date|naturaltime|default:'' }}</td>
<td>{{ announcement.end_date|naturaltime|default:'' }}</td>
<td>{% if announcement.active %}{% trans "active" %}{% else %}{% trans "inactive" %}{% endif %}</td>