mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-16 05:06:32 +00:00
Code Issues Projects Releases Wiki Activity

rearrange ostatus templates

Browse source
This commit is contained in:
Hugh Rundle 2021-11-28 16:54:25 +11:00
parent d05e100421
commit 610114b4eb
No known key found for this signature in database
GPG key ID: CD23D6039184286B
3 changed files with 49 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bookwyrm/templates/ostatus/ostatus_error.html → bookwyrm/templates/ostatus/error.html
View file

@ -29,10 +29,22 @@
</div>
{% elif error == 'ostatus_subscribe' %}
<div class="notification is-warning">
<div class="notification is-warning has-text-centered">
<p>{% blocktrans %}Something went wrong trying to follow <strong>{{ account }}</strong>{% endblocktrans %}</p>
<p>{% trans 'Check you have the correct username before trying again.' %}</p>
</div>
{% elif error == 'is_blocked' %}
<div class="notification is-danger has-text-centered">
<p>{% blocktrans %}You have blocked <strong>{{ account }}</strong>{% endblocktrans %}</p>
</div>
{% elif error == 'already_following' %}
<div class="notification is-success has-text-centered">
<p>{% blocktrans %}You are already following <strong>{{ account }}</strong>{% endblocktrans %}</p>
</div>
{% elif error == 'already_requested' %}
<div class="notification is-success has-text-centered">
<p>{% blocktrans %}You have already requested to follow <strong>{{ account }}</strong>{% endblocktrans %}</p>
</div>
{% endif %}
</div>
{% endblock %}

7
bookwyrm/templates/ostatus/ostatus_subscribe.html → bookwyrm/templates/ostatus/subscribe.html
View file

@ -25,7 +25,7 @@
{% block content %}
{% if error or not request.user.is_authenticated %}
{% include 'ostatus/ostatus_error.html' with error=error user=user account=account %}
{% include 'ostatus/error.html' with error=error user=user account=account %}
{% else %}
<div class="block card">
<div class="card-content">
@ -45,13 +45,14 @@
</span>
<span class="subtitle is-7 is-block">@{{ user|username }}</span>
</a>
<form name="follow" method="post" action="">
<form name="follow" method="post" action="{% url 'follow' %}/?next={% url 'ostatus-success' %}?following={{ user.username }}">
{% csrf_token %}
<input name="user" value={{ user.username }} hidden>
<button class="button is-link" type="submit">{% trans "Follow " %} {{ user.name }}</button>
</form>
</div>
</div>
<div class="">
<div>
{% if user.summary %}
{{ user.summary|to_markdown|safe|truncatechars_html:120 }}
{% else %}&nbsp;{% endif %}

32
bookwyrm/templates/ostatus/success.html Normal file
View file

@ -0,0 +1,32 @@
{% extends 'ostatus/template.html' %}
{% load i18n %}
{% load utilities %}
{% block content %}
<div class="block card">
<div class="card-content">
<div class="media">
<a href="{{ user.local_path }}" class="media-left">
{% include 'snippets/avatar.html' with user=user large=True %}
</a>
<div class="media-content">
<a href="{{ user.local_path }}" class="is-block mb-2">
<span class="title is-4 is-block">
{{ user.display_name }}
{% if user.manually_approves_followers %}
<span class="icon icon-lock is-size-7" title="{% trans 'Locked account' %}">
<span class="is-sr-only">{% trans "Locked account" %}</span>
</span>
{% endif %}
</span>
<span class="subtitle is-7 is-block">@{{ user|username }}</span>
</a>
</div>
<!-- TODO: this shoudl be a big tick instead -->
<a href="{{ user.local_path }}" class="media-left">
{% include 'snippets/avatar.html' with user=user large=True %}
</a>
</div>
</div>
</div>
{% endblock %}