mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-10-31 22:19:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2020-11-05 13:51:37 -08:00
commit 573bdfd56b
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bookwyrm/templates/about.html
View file

@ -3,16 +3,14 @@
<div class="columns"> <div class="columns">
<div class="column block"> <div class="column block">
<blockquote> {% include 'snippets/about.html' with site_settings=site_settings %}
{% include 'snippets/about.html' with site_settings=site_settings %}
</blockquote>
</div> </div>
<div class="column block"> <div class="column block">
<h2 class="title">Code of Conduct</h2> <h2 class="title">Code of Conduct</h2>
<blockquote> <div class="content">
{{ site_settings.code_of_conduct }} {{ site_settings.code_of_conduct | safe }}
</blockquote> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
bookwyrm/templates/book.html
View file

@ -11,7 +11,7 @@
{% if request.user.is_authenticated and perms.bookwyrm.edit_book %} {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
<div class="level-right"> <div class="level-right">
<a href="{{ book.id }}/edit">edit <a href="{{ book.id }}/edit">
<span class="icon icon-pencil"> <span class="icon icon-pencil">
<span class="is-sr-only">Edit Book</span> <span class="is-sr-only">Edit Book</span>
</span> </span>

1
bookwyrm/templates/edit_book.html
View file

@ -78,6 +78,7 @@
</div> </div>
<div class="block"> <div class="block">
<button class="button is-primary" type="submit">Save</button> <button class="button is-primary" type="submit">Save</button>
<a class="button is-danger is-light" href="/book/{{ book.id }}">Cancel</a>
</div> </div>
</form> </form>

4
bookwyrm/templates/login.html
View file

@ -51,6 +51,10 @@
<div class="column"> <div class="column">
<div class="block"> <div class="block">
{% include 'snippets/about.html' with site_settings=site_settings %} {% include 'snippets/about.html' with site_settings=site_settings %}
<p class="block">
<a href="/about/">More about this site</a>
</p>
</div> </div>
</div> </div>

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

@ -5,7 +5,3 @@
<p class="block"> <p class="block">
{{ site_settings.instance_description }} {{ site_settings.instance_description }}
</p> </p>
<p class="block">
<a href="/about/">More about this site</a>
</p>

6
bookwyrm/templates/snippets/follow_button.html
View file

@ -11,14 +11,14 @@ Follow request already sent.
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="user" value="{{ user.username }}"> <input type="hidden" name="user" value="{{ user.username }}">
{% if user.manually_approves_followers %} {% if user.manually_approves_followers %}
<button class="button is-small" type="submit">Send follow request</button> <button class="button is-small is-link is-light" type="submit">Send follow request</button>
{% else %} {% else %}
<button class="button is-small" type="submit">Follow</button> <button class="button is-small is-link is-light" type="submit">Follow</button>
{% endif %} {% endif %}
</form> </form>
<form action="/unfollow/" method="POST" onsubmit="interact(event)" class="follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}"> <form action="/unfollow/" method="POST" onsubmit="interact(event)" class="follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="user" value="{{ user.username }}"> <input type="hidden" name="user" value="{{ user.username }}">
<button class="button is-small" type="submit">Unfollow</button> <button class="button is-small is-danger is-light" type="submit">Unfollow</button>
</form> </form>
{% endif %} {% endif %}