Merge branch 'main' into progress-update-ui

This commit is contained in:
Mouse Reeve
2021-03-20 17:38:22 -07:00
17 changed files with 408 additions and 328 deletions

View File

@ -11,16 +11,16 @@
{% csrf_token %}
<label class="label" for="source">
<p>{% trans "Data source" %}</p>
<p>{% trans "Data source" %}</p>
<div class="select {{ class }}">
<select name="source" id="source">
<option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
GoodReads
</option>
<option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
LibraryThing
</option>
</select>
<select name="source" id="source">
<option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
GoodReads
</option>
<option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
LibraryThing
</option>
</select>
</div>
</label>

View File

@ -18,8 +18,12 @@
<div class="control">
<input
aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
class="input" type="number" min="0"
name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
class="input"
type="number"
min="0"
name="progress"
size="3"
value="{{ readthrough.progress|default:'' }}">
</div>
<div class="control select">
<select name="progress_mode" aria-label="Progress mode">