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

5
bookwyrm/templates/feed/direct_messages.html
View File

@ -1,9 +1,10 @@
{% extends 'feed/feed_layout.html' %}
{% load i18n %}
{% block panel %}
<header class="block">
<h1 class="title">Direct Messages{% if partner %} with {% include 'snippets/username.html' with user=partner %}{% endif %}</h1>
{% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> All messages</a></p>{% endif %}
{% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
</header>
<div class="box">
@ -12,7 +13,7 @@
<section class="block">
{% if not activities %}
<p>You have no messages right now.</p>
<p>{% trans "You have no messages right now." %}</p>
{% endif %}
{% for activity in activities %}
<div class="block">

13
bookwyrm/templates/feed/feed.html
View File

@ -1,18 +1,19 @@
{% extends 'feed/feed_layout.html' %}
{% load i18n %}
{% load bookwyrm_tags %}
{% block panel %}
<h1 class="title">{{ tab | title }} Timeline</h1>
<h1 class="title">{% blocktrans with tab_title=tab|title %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
<div class="tabs">
<ul>
<li class="{% if tab == 'home' %}is-active{% endif %}">
<a href="/#feed">Home</a>
<a href="/#feed">{% trans "Home" %}</a>
</li>
<li class="{% if tab == 'local' %}is-active{% endif %}">
<a href="/local#feed">Local</a>
<a href="/local#feed">{% trans "Local" %}</a>
</li>
<li class="{% if tab == 'federated' %}is-active{% endif %}">
<a href="/federated#feed">Federated</a>
<a href="/federated#feed">{% trans "Federated" %}</a>
</li>
</ul>
</div>
@ -20,7 +21,7 @@
{# announcements and system messages #}
{% if not goal and tab == 'home' %}
{% now 'Y' as year %}
<section class="block hidden" aria-title="Announcements" data-hide="hide-{{ year }}-reading-goal">
<section class="block hidden" aria-title="{% trans 'Announcements' %}" data-hide="hide-{{ year }}-reading-goal">
{% include 'snippets/goal_card.html' with year=year %}
<hr>
</section>
@ -28,7 +29,7 @@
{# activity feed #}
{% if not activities %}
<p>There aren't any activities right now! Try following a user to get started</p>
<p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p>
{% endif %}
{% for activity in activities %}
<div class="block">

7
bookwyrm/templates/feed/feed_layout.html
View File

@ -1,13 +1,14 @@
{% extends 'layout.html' %}
{% load i18n %}
{% load bookwyrm_tags %}
{% block content %}
<div class="columns">
{% if user.is_authenticated %}
<div class="column is-one-third">
<h2 class="title is-5">Your books</h2>
<h2 class="title is-5">{% trans "Your books" %}</h2>
{% if not suggested_books %}
<p>There are no books here right now! Try searching for a book to get started</p>
<p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
{% else %}
<seven-minute-tabs>
<div class="tabs is-small">
@ -66,7 +67,7 @@
{% if goal %}
<section class="section">
<div class="block">
<h3 class="title is-4">{{ goal.year }} Reading Goal</h3>
<h3 class="title is-4">{% blocktrans with yar=goal.year %}{{ year }} Reading Goal{% endblocktrans %}</h3>
{% include 'snippets/goal_progress.html' with goal=goal %}
</div>
</section>

3
bookwyrm/templates/feed/status.html
View File

@ -1,9 +1,10 @@
{% extends 'feed/feed_layout.html' %}
{% load i18n %}
{% block panel %}
<header class="block">
<a href="/#feed" class="button" data-back>
<span class="icon icon-arrow-left" aira-hidden="true"></span>
<span>Back</span>
<span>{% trans "Back" %}</span>
</a>
</header>