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

Merge branch 'main' of https://github.com/mouse-reeve/bookwyrm into main

Browse Source
This commit is contained in:
Fabien Basmaison
2021-03-04 20:49:31 +01:00
parent dab6592c12 74ab3505fe
commit 1a64f69587
31 changed files with 4376 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bookwyrm/templates/snippets/status/status.html
View File

@ -1,7 +1,7 @@
{% load bookwyrm_tags %}
{% load i18n %}
{% if not status.deleted %}
{% if status.status_type == 'Boost' %}
{% if status.status_type == 'Announce' %}
{% include 'snippets/avatar.html' with user=status.user %}
{% include 'snippets/username.html' with user=status.user %}
{% trans "boosted" %}

2
bookwyrm/templates/snippets/status/status_content.html
View File

@ -34,7 +34,7 @@
</div>
{% endif %}
{% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
{% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
{% include 'snippets/trimmed_text.html' with full=status.content|safe %}
{% endif %}
{% if status.attachments.exists %}

2
bookwyrm/templates/snippets/status/status_options.html
View File

@ -14,7 +14,7 @@
<form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
{% csrf_token %}
<button class="button is-danger is-light is-fullwidth is-small" type="submit">
{% trans "Delete post" %}
{% trans "Delete status" %}
</button>
</form>
</li>