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

Merge branch 'upstream' into tab-keyboard-accessibility

Browse Source
This commit is contained in:
Ned Zimmerman
2021-02-28 12:39:56 -04:00
parent bc7f830b2b 9247a0f6f7
commit b324e668ca
104 changed files with 2680 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bookwyrm/templates/user/create_shelf_form.html
View File

@ -1,7 +1,8 @@
{% extends 'components/inline_form.html' %}
{% load i18n %}
{% block header %}
Create New Shelf
{% trans "Create New Shelf" %}
{% endblock %}
{% block form %}
@ -9,7 +10,7 @@ Create New Shelf
{% csrf_token %}
<input type="hidden" name="user" value="{{ request.user.id }}">
<div class="field">
<label class="label" for="id_name_create">Name:</label>
<label class="label" for="id_name_create">{% trans "Name:" %}</label>
<input type="text" name="name" maxlength="100" class="input" required="true" id="id_name_create">
</div>
@ -18,7 +19,7 @@ Create New Shelf
{% include 'snippets/privacy_select.html' %}
</div>
<div class="control">
<button class="button is-primary" type="submit">Create shelf</button>
<button class="button is-primary" type="submit">{% trans "Create shelf" %}</button>
</div>
</div>
</form>

7
bookwyrm/templates/user/edit_shelf_form.html
View File

@ -1,7 +1,8 @@
{% extends 'components/inline_form.html' %}
{% load i18n %}
{% block header %}
Edit Shelf
{% trans "Edit Shelf" %}
{% endblock %}
{% block form %}
@ -10,7 +11,7 @@ Edit Shelf
<input type="hidden" name="user" value="{{ request.user.id }}">
{% if shelf.editable %}
<div class="field">
<label class="label" for="id_name">Name:</label>
<label class="label" for="id_name">{% trans "Name:" %}</label>
<input type="text" name="name" maxlength="100" class="input" required="true" value="{{ shelf.name }}" id="id_name">
</div>
{% else %}
@ -22,7 +23,7 @@ Edit Shelf
{% include 'snippets/privacy_select.html' with current=shelf.privacy %}
</div>
<div class="control">
<button class="button is-primary" type="submit">Update shelf</button>
<button class="button is-primary" type="submit">{% trans "Update shelf" %}</button>
</div>
</div>
</form>

5
bookwyrm/templates/user/followers.html
View File

@ -1,4 +1,5 @@
{% extends 'user/user_layout.html' %}
{% load i18n %}
{% load bookwyrm_tags %}
{% block header %}
@ -13,7 +14,7 @@
{% block panel %}
<div class="block">
<h2 class="title">Followers</h2>
<h2 class="title">{% trans "Followers" %}</h2>
{% for followers in followers %}
<div class="block columns">
<div class="column">
@ -26,7 +27,7 @@
</div>
{% endfor %}
{% if not followers.count %}
<div>{{ user|username }} has no followers</div>
<div>{% blocktrans with username=user|username %}{{ username }} has no followers{% endblocktrans %}</div>
{% endif %}
</div>
{% endblock %}

5
bookwyrm/templates/user/following.html
View File

@ -1,4 +1,5 @@
{% extends 'user/user_layout.html' %}
{% load i18n %}
{% load bookwyrm_tags %}
{% block header %}
@ -13,7 +14,7 @@
{% block panel %}
<div class="block">
<h2 class="title">Following</h2>
<h2 class="title">{% trans "Following" %}</h2>
{% for follower in user.following.all %}
<div class="block columns">
<div class="column">
@ -26,7 +27,7 @@
</div>
{% endfor %}
{% if not following.count %}
<div>{{ user|username }} isn't following any users</div>
<div>{% blocktrans with username=user|username %}{{ username }} isn't following any users{% endblocktrans %}</div>
{% endif %}
</div>
{% endblock %}

3
bookwyrm/templates/user/lists.html
View File

@ -1,4 +1,5 @@
{% extends 'user/user_layout.html' %}
{% load i18n %}
{% block header %}
<div class="columns is-mobile">
@ -24,7 +25,7 @@
<section class="block content">
<form name="create-list" method="post" action="{% url 'lists' %}" class="box hidden" id="create-list">
<header class="columns">
<h3 class="title column">Create list</h3>
<h3 class="title column">{% trans "Create list" %}</h3>
<div class="column is-narrow">
{% include 'snippets/toggle/toggle_button.html' with controls_text="create-list" label="close" class="delete" nonbutton=True %}
</div>

20
bookwyrm/templates/user/user.html
View File

@ -1,15 +1,16 @@
{% extends 'user/user_layout.html' %}
{% load i18n %}
{% block header %}
<div class="columns is-mobile">
<div class="column">
<h1 class="title">User profile</h1>
<h1 class="title">{% trans "User profile" %}</h1>
</div>
{% if is_self %}
<div class="column is-narrow">
<a href="/preferences/profile">
<span class="icon icon-pencil" title="Edit profile">
<span class="is-sr-only">Edit profile</span>
<span class="is-sr-only">{% trans "Edit profile" %}</span>
</span>
</a>
</div>
@ -20,12 +21,12 @@
{% block panel %}
{% if user.bookwyrm_user %}
<div class="block">
<h2 class="title">Shelves</h2>
<h2 class="title">{% trans "Shelves" %}</h2>
<div class="columns">
{% for shelf in shelves %}
<div class="column is-narrow">
<h3>{{ shelf.name }}
{% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">See all {{ shelf.size }}</a>)</small>{% endif %}</h3>
{% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}See all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
<div class="is-mobile field is-grouped">
{% for book in shelf.books %}
<div class="control">
@ -38,7 +39,7 @@
</div>
{% endfor %}
</div>
<small><a href="{{ user.local_path }}/shelves">See all {{ shelf_count }} shelves</a></small>
<small><a href="{{ user.local_path }}/shelves">{% blocktrans %}See all {{ shelf_count }} shelves{% endblocktrans %}</a></small>
</div>
{% endif %}
@ -49,16 +50,17 @@
</div>
{% elif user == request.user %}
<div class="block">
<h2 class="title is-4"><a href="{{ user.local_path }}/goal/{% now 'Y' %}">Set a reading goal for {% now 'Y' %}</a></h2>
{% now 'Y' as year %}
<h2 class="title is-4"><a href="{{ user.local_path }}/goal/{{ year }}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
</div>
{% endif %}
<div>
<div class="columns is-mobile">
<h2 class="title column">User Activity</h2>
<h2 class="title column">{% trans "User Activity" %}</h2>
<div class="column is-narrow">
<a class="icon icon-rss" target="_blank" href="{{ user.local_path }}/rss">
<span class="is-sr-only">RSS feed</span>
<span class="is-sr-only">{% trans "RSS feed" %}</span>
</a>
</div>
</div>
@ -69,7 +71,7 @@
{% endfor %}
{% if not activities %}
<div class="block">
<p>No activities yet!</a>
<p>{% trans "No activities yet!" %}</a>
</div>
{% endif %}

41
bookwyrm/templates/user/user_layout.html
View File

@ -1,4 +1,5 @@
{% extends 'layout.html' %}
{% load i18n %}
{% load humanize %}
{% load bookwyrm_tags %}
@ -10,35 +11,13 @@
{# user bio #}
<div class="block">
<div class="columns">
<div class="column is-narrow">
<div class="media">
<div class="media-left">
<a href="{{ user.local_path }}">
{% include 'snippets/avatar.html' with user=user large=True %}
</a>
</div>
<div class="media-content">
<p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
<p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
<p>Joined {{ user.created_date | naturaltime }}</p>
<p>
<a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
<a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
</p>
</div>
</div>
<div class="column is-two-fifths">
{% include 'user/user_preview.html' with user=user %}
</div>
<div class="column">
<div class="column box has-background-white-bis content">
{% if user.summary %}
<div class="columns">
<div class="column is-narrow">
<span class="icon icon-quote-open"></span>
</div>
<div class="column">
<blockquote>{{ user.summary | to_markdown | safe }}</blockquote>
</div>
</div>
{{ user.summary | to_markdown | safe }}
{% endif %}
</div>
</div>
@ -48,7 +27,7 @@
{% if is_self and user.follower_requests.all %}
<div class="follow-requests">
<h2>Follow Requests</h2>
<h2>{% trans "Follow Requests" %}</h2>
{% for requester in user.follower_requests.all %}
<div class="row shrink">
<p>
@ -66,25 +45,25 @@
<ul>
{% url 'user-feed' user|username as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">Activity</a>
<a href="{{ url }}">{% trans "Activity" %}</a>
</li>
{% if is_self or user.goal.exists %}
{% now 'Y' as year %}
{% url 'user-goal' user|username year as url %}
<li{% if url in request.path %} class="is-active"{% endif %}>
<a href="{{ url }}">Reading Goal</a>
<a href="{{ url }}">{% trans "Reading Goal" %}</a>
</li>
{% endif %}
{% if is_self or user.lists.exists %}
{% url 'user-lists' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %}>
<a href="{{ url }}">Lists</a>
<a href="{{ url }}">{% trans "Lists" %}</a>
</li>
{% endif %}
{% if user.shelf_set.exists %}
{% url 'user-shelves' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %}>
<a href="{{ url }}">Shelves</a>
<a href="{{ url }}">{% trans "Shelves" %}</a>
</li>
{% endif %}
</ul>

20
bookwyrm/templates/user/user_preview.html Normal file
View File

@ -0,0 +1,20 @@
{% load i18n %}
{% load humanize %}
<div class="media block">
<div class="media-left">
<a href="{{ user.local_path }}">
{% include 'snippets/avatar.html' with user=user large=True %}
</a>
</div>
<div class="media-content">
<p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
<p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
<p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
<p>
<a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
<a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
</p>
</div>
</div>