yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CSS reorg and cleans up ui

Browse Source 
Fixes #93
This commit is contained in:
Mouse Reeve
2020-04-01 19:38:07 -07:00
parent cfff75764b
commit 976e7ddf79
13 changed files with 302 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fedireads/templates/snippets/book.html
View File

@ -1,18 +0,0 @@
{% load fr_display %}
{% include 'snippets/book_cover.html' with book=book %}
<p class="title">
<a href="/book/{{ book.fedireads_key }}">{{ book.title }}</a>
</p>
<p>
by {% include 'snippets/authors.html' with book=book %}
</p>
{% if rating %}
{{ rating | stars }} {{ rating }}
{% endif %}
{% if description %}
<blockquote>{{ book.description | description }}</blockquote>
{% endif %}
{% include 'snippets/shelve_button.html' with book=book pulldown=shelf_pulldown %}

7
fedireads/templates/snippets/book_description.html Normal file
View File

@ -0,0 +1,7 @@
{% load fr_display %}
{% if book.description %}
<blockquote>{{ book.description | description }}</blockquote>
{% elif book.parent_work.description %}
<blockquote>{{ book.parent_work.description | description }}</blockquote>
{% endif %}

9
fedireads/templates/snippets/book_titleby.html Normal file
View File

@ -0,0 +1,9 @@
<span class="title">
<a href="/book/{{ book.fedireads_key }}">{{ book.title }}</a>
</span>
{% if book.authors %}
<span class="author">
by {% include 'snippets/authors.html' with book=book %}
</span>
{% endif %}

12
fedireads/templates/snippets/covers_shelf.html
View File

@ -9,11 +9,15 @@
<small>(<a href="/shelf/{{ user | username }}/{{ shelf.identifier }}">See all {{ shelf.size }}</a>)</small>
{% endif %}
</h2>
<div class="covers-shelf {{ shelf.identifier }}">
<div class="covers-shelf {{ shelf.identifier }} ">
{% for book in shelf.books %}
<div class="book-preview" onclick="show_compose(this, event)" id="book-{{ book.id }}">
<a href="{{ book.absolute_id }}">{% include 'snippets/book_cover.html' with book=book %}</a>
{% include 'snippets/shelve_button.html' with book=book %}
<div class="cover-container">
<div >
<a href="{{ book.absolute_id }}" onclick="show_compose(this, event)" id="book-{{ book.id }}">
{% include 'snippets/book_cover.html' with book=book %}
</a>
</div>
{% include 'snippets/shelve_button.html' with book=book %}
</div>
{% endfor %}
</div>

4
fedireads/templates/snippets/status.html
View File

@ -11,7 +11,9 @@
{% endif %}
</h2>
{% include 'snippets/status_content.html' with status=status %}
<div class="status-content">
{% include 'snippets/status_content.html' with status=status %}
</div>
</div>
{% if status.status_type == 'Boost' %}

74
fedireads/templates/snippets/status_content.html
View File

@ -1,36 +1,52 @@
{% load fr_display %}
{% if not hide_book and status.mention_books.count %}
<div class="row book-row">
{% for book in status.mention_books.all|slice:"0:3" %}
<div class="book-preview">
{% if status.status_type == 'Review' %}
{% include 'snippets/book.html' with book=book %}
{% else %}
{% include 'snippets/book.html' with book=book description=True %}
{% endif %}
</div>
{% endfor %}
</div>
<div class="row">
{% for book in status.mention_books.all|slice:"0:4" %}
<div class="row">
<div class="cover-container">
{% include 'snippets/book_cover.html' with book=book %}
{% if status.mention_books.count > 1 %}
<p>{% include 'snippets/book_titleby.html' with book=book %}</p>
{% endif %}
{% include 'snippets/shelve_button.html' with book=book %}
</div>
{% if status.mention_books.count == 1 %}
<div>
<p>{% include 'snippets/book_titleby.html' with book=book %}</p>
{% include 'snippets/book_description.html' with book=book %}
</div>
{% endif %}
</div>
{% endfor %}
</div>
{% endif %}
{% if not hide_book and status.book%}
<div class="book-preview">
{% if status.status_type == 'Review' %}
{% include 'snippets/book.html' with book=status.book %}
{% else %}
{% include 'snippets/book.html' with book=status.book description=True %}
<div class="row">
{% if not hide_book and status.book %}
<div class="cover-container">
{% include 'snippets/book_cover.html' with book=status.book %}
{% include 'snippets/shelve_button.html' with book=status.book %}
</div>
{% endif %}
</div>
{% endif %}
{% if status.status_type == 'Review' %}<h4>{{ status.name }}
<small>{{ status.rating | stars }} stars, by {% include 'snippets/username.html' with user=status.user %}</small>
</h4>{% endif %}
{% if status.status_type != 'Update' and status.status_type != 'Boost' %}
<blockquote>{{ status.content | safe }}</blockquote>
{% endif %}
{% if status.status_type == 'Boost' %}
{% include 'snippets/status_content.html' with status=status|boosted_status %}
{% endif %}
{% if not max_depth and status.reply_parent or status|replies %}<p><a href="{{ status.absolute_id }}">Thread</a>{% endif %}
<div>
{% if status.status_type == 'Review' %}
<h3>
{{ status.name }}<br>
{{ status.rating | stars }}
</h3>
{% endif %}
{% if status.status_type != 'Update' and status.status_type != 'Boost' %}
<blockquote>{{ status.content | safe }}</blockquote>
{% endif %}
{% if status.status_type == 'Boost' %}
{% include 'snippets/status_content.html' with status=status|boosted_status %}
{% endif %}
{% if not max_depth and status.reply_parent or status|replies %}<p><a href="{{ status.absolute_id }}">Thread</a>{% endif %}
</div>
</div>