mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-02 14:26:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #570 from mouse-reeve/progress-display

Browse source 
Fixes incorrect display of reading progress
This commit is contained in:
Mouse Reeve 2021-01-30 09:26:42 -08:00 committed by GitHub
commit 9b7c10ce6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/templates/snippets/readthrough.html
View file

@ -6,9 +6,10 @@
Progress Updates: Progress Updates:
</dl> </dl>
<ul> <ul>
{% if readthrough.progress %} {% if readthrough.finish_date or readthrough.progress %}
<li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: finished {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %} <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: finished {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
{% else %}{{ readthrough.progress }}%{% endif %}{% endif %} {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
{% if readthrough.progress %}
{% include 'snippets/toggle/toggle_button.html' with text="Show all updates" controls_text="updates" controls_uid=readthrough.id class="is-small" %} {% include 'snippets/toggle/toggle_button.html' with text="Show all updates" controls_text="updates" controls_uid=readthrough.id class="is-small" %}
<ul id="updates-{{ readthrough.id }}" class="hidden"> <ul id="updates-{{ readthrough.id }}" class="hidden">
{% for progress_update in readthrough.progress_updates %} {% for progress_update in readthrough.progress_updates %}
@ -31,6 +32,7 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %}
</li> </li>
{% endif %} {% endif %}
<li>{{ readthrough.start_date | naturalday }}: started</li> <li>{{ readthrough.start_date | naturalday }}: started</li>