Merge branch 'main' into partially-read-shelf

bookwyrm/templates/about/about.html

@@ -14,23 +14,25 @@
 {% cache 604800 about_page %}
 
 {% get_book_superlatives as superlatives %}
-<section class="content pb-4">
-    <h2>
-        {% blocktrans with site_name=site.name %}Welcome to {{ site_name }}!{% endblocktrans %}
-    </h2>
+<section class=" pb-4">
+    <div class="content">
+        <h2>
+            {% blocktrans with site_name=site.name %}Welcome to {{ site_name }}!{% endblocktrans %}
+        </h2>
 
-    <p class="subtitle notification has-background-primary-highlight">
-        {% blocktrans trimmed with site_name=site.name %}
-            {{ site_name }} is part of <em>BookWyrm</em>, a network of independent, self-directed communities for readers.
-            While you can interact seamlessly with users anywhere in the <a href="https://joinbookwyrm.com/instances/" target="_blank">BookWyrm network</a>, this community is unique.
-        {% endblocktrans %}
-    </p>
+        <p class="subtitle notification has-background-primary-highlight">
+            {% blocktrans trimmed with site_name=site.name %}
+                {{ site_name }} is part of <em>BookWyrm</em>, a network of independent, self-directed communities for readers.
+                While you can interact seamlessly with users anywhere in the <a href="https://joinbookwyrm.com/instances/" target="_blank">BookWyrm network</a>, this community is unique.
+            {% endblocktrans %}
+        </p>
+    </div>
 
     <div class="columns">
         {% if superlatives.top_rated %}
         {% with book=superlatives.top_rated.default_edition rating=superlatives.top_rated.rating %}
         <div class="column is-one-third is-flex">
-            <div class="media notification">
+            <div class="media notification is-clipped">
                 <div class="media-left">
                     <a href="{{ book.local_path }}">
                         {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' size='medium' aria='show' %}
@@ -49,7 +51,7 @@
         {% if superlatives.wanted %}
         {% with book=superlatives.wanted.default_edition %}
         <div class="column is-one-third is-flex">
-            <div class="media notification">
+            <div class="media notification is-clipped">
                 <div class="media-left">
                     <a href="{{ book.local_path }}">
                         {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' size='medium' aria='show' %}
@@ -68,7 +70,7 @@
         {% if superlatives.controversial %}
         {% with book=superlatives.controversial.default_edition %}
         <div class="column is-one-third is-flex">
-            <div class="media notification">
+            <div class="media notification is-clipped">
                 <div class="media-left">
                     <a href="{{ book.local_path }}">
                         {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' size='medium' aria='show' %}

bookwyrm/templates/directory/user_card.html

@@ -33,7 +33,7 @@
     </div>
     <footer class="card-footer">
         {% if user != request.user %}
-        {% if user.mutuals %}
+        {% if user.mutuals and not user.hide_follows %}
         <div class="card-footer-item">
             <div class="has-text-centered">
                 <p class="title is-6 mb-0">{{ user.mutuals }}</p>

bookwyrm/templates/groups/suggested_users.html

@@ -15,7 +15,7 @@
                 <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
             </a>
             {% include 'snippets/add_to_group_button.html' with user=user group=group %}
-            {% if user.mutuals %}
+            {% if user.mutuals and not user.hide_follows %}
             <p class="help">
                 {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
                 {{ mutuals }} follower you follow

bookwyrm/templates/layout.html

@@ -1,14 +1,14 @@
 {% load layout %}
+{% load sass_tags %}
 {% load i18n %}
 {% load static %}
-{% load sass_tags %}
 
 <!DOCTYPE html>
 <html lang="{% get_lang %}">
 <head>
     <title>{% block title %}BookWyrm{% endblock %} - {{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="{% sass_src 'css/bookwyrm.scss' %}" rel="stylesheet" type="text/css" />
+    <link href="{% sass_src site_theme %}" rel="stylesheet" type="text/css" />
 
     <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch' %}" title="{% blocktrans with site_name=site.name %}{{ site_name }} search{% endblocktrans %}" />
 

bookwyrm/templates/preferences/edit_user.html

@@ -10,7 +10,7 @@
 {% block profile-tabs %}
 <ul class="menu-list">
     <li><a href="#profile">{% trans "Profile" %}</a></li>
-    <li><a href="#display-preferences">{% trans "Display preferences" %}</a></li>
+    <li><a href="#display-preferences">{% trans "Display" %}</a></li>
     <li><a href="#privacy">{% trans "Privacy" %}</a></li>
 </ul>
 {% endblock %}
@@ -61,7 +61,7 @@
     <hr aria-hidden="true">
 
     <section class="block" id="display-preferences">
-        <h2 class="title is-4">{% trans "Display preferences" %}</h2>
+        <h2 class="title is-4">{% trans "Display" %}</h2>
         <div class="box">
             <div class="field">
                 <label class="checkbox label" for="id_show_goal">
@@ -97,6 +97,12 @@
                     {{ form.preferred_language }}
                 </div>
             </div>
+            <div class="field">
+                <label class="label" for="id_them">{% trans "Theme:" %}</label>
+                <div class="select">
+                    {{ form.theme }}
+                </div>
+            </div>
         </div>
     </section>
 
@@ -111,6 +117,12 @@
                     {% trans "Manually approve followers" %}
                 </label>
             </div>
+            <div class="field">
+                <label class="checkbox label" for="id_hide_follows">
+                    {{ form.hide_follows }}
+                    {% trans "Hide followers and following on profile" %}
+                </label>
+            </div>
             <div class="field">
                 <label class="label" for="id_default_post_privacy">
                     {% trans "Default post privacy:" %}

bookwyrm/templates/settings/federation/edit_instance.html

@@ -4,7 +4,19 @@
 
 {% block header %}
 {% trans "Add instance" %}
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to instance list" %}</a>
+{% endblock %}
+
+{% block breadcrumbs %}
+<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
+    <ul>
+        <li><a href="{% url 'settings-federation' %}">{% trans "Federated Instances" %}</a></li>
+        <li class="is-active">
+            <a href="#" aria-current="page">
+                {% trans "Add instance" %}
+            </a>
+        </li>
+    </ul>
+</nav>
 {% endblock %}
 
 {% block panel %}
@@ -73,9 +85,13 @@
         <label class="label" for="id_notes">
             {% trans "Notes:" %}
         </label>
-        <textarea name="notes" cols="40" rows="5" class="textarea" id="id_notes">
-            {{ form.notes.value|default:'' }}
-        </textarea>
+        <textarea
+            name="notes"
+            cols="40"
+            rows="5"
+            class="textarea"
+            id="id_notes"
+        >{{ form.notes.value|default:'' }}</textarea>
     </div>
 
     <button type="submit" class="button is-primary">

bookwyrm/templates/settings/federation/instance.html

@@ -9,8 +9,26 @@
 
 {% if server.status == "blocked" %}<span class="icon icon-x has-text-danger is-size-5" title="{% trans 'Blocked' %}"><span class="is-sr-only">{% trans "Blocked" %}</span></span>
 {% endif %}
+{% endblock %}
 
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to list" %}</a>
+{% block edit-button %}
+<form name="reload" method="POST" action="{% url 'settings-federated-server-refresh' server.id %}">
+    {% csrf_token %}
+    <button class="button" type="submit">{% trans "Refresh data" %}</button>
+</form>
+{% endblock %}
+
+{% block breadcrumbs %}
+<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
+    <ul>
+        <li><a href="{% url 'settings-federation' %}">{% trans "Federated Instances" %}</a></li>
+        <li class="is-active">
+            <a href="#" aria-current="page">
+                {{ server.server_name }}
+            </a>
+        </li>
+    </ul>
+</nav>
 {% endblock %}
 
 {% block panel %}

bookwyrm/templates/settings/federation/instance_blocklist.html

@@ -4,7 +4,19 @@
 
 {% block header %}
 {% trans "Import Blocklist" %}
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to instance list" %}</a>
+{% endblock %}
+
+{% block breadcrumbs %}
+<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
+    <ul>
+        <li><a href="{% url 'settings-federation' %}">{% trans "Federated Instances" %}</a></li>
+        <li class="is-active">
+            <a href="#" aria-current="page">
+                {% trans "Import Blocklist" %}
+            </a>
+        </li>
+    </ul>
+</nav>
 {% endblock %}
 
 {% block panel %}

bookwyrm/templates/settings/federation/instance_list.html

@@ -16,11 +16,11 @@
     <ul>
         {% url 'settings-federation' status='federated' as url %}
         <li {% if request.path in url %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Federated" %}</a>
+            <a href="{{ url }}">{% trans "Federated" %} ({{ federated_count }})</a>
         </li>
         {% url 'settings-federation' status='blocked' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Blocked" %}</a>
+            <a href="{{ url }}">{% trans "Blocked" %} ({{ blocked_count }})</a>
         </li>
     </ul>
 </div>

bookwyrm/templates/settings/layout.html

@@ -86,6 +86,10 @@
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings" %}</a>
                 {% block site-subtabs %}{% endblock %}
             </li>
+            <li>
+                {% url 'settings-themes' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Themes" %}</a>
+            </li>
         </ul>
         {% endif %}
     </nav>

bookwyrm/templates/settings/site.html

@@ -8,7 +8,7 @@
 {% block site-subtabs %}
 <ul class="menu-list">
     <li><a href="#instance-info">{% trans "Instance Info" %}</a></li>
-    <li><a href="#images">{% trans "Images" %}</a></li>
+    <li><a href="#display">{% trans "Display" %}</a></li>
     <li><a href="#footer">{% trans "Footer Content" %}</a></li>
     <li><a href="#registration">{% trans "Registration" %}</a></li>
 </ul>
@@ -33,7 +33,12 @@
 </div>
 {% endif %}
 
-<form action="{% url 'settings-site' %}" method="POST" class="content" enctype="multipart/form-data">
+<form
+    action="{% url 'settings-site' %}"
+    method="POST"
+    class="content"
+    enctype="multipart/form-data"
+>
     {% csrf_token %}
     <section class="block" id="instance_info">
         <h2 class="title is-4">{% trans "Instance Info" %}</h2>
@@ -68,20 +73,33 @@
 
     <hr aria-hidden="true">
 
-    <section class="block" id="images">
-        <h2 class="title is-4">{% trans "Images" %}</h2>
-        <div class="box is-flex">
-            <div>
-                <label class="label" for="id_logo">{% trans "Logo:" %}</label>
-                {{ site_form.logo }}
+    <section class="block" id="display">
+        <h2 class="title is-4">{% trans "Display" %}</h2>
+        <div class="box">
+            <h3 class="title is-5">{% trans "Images" %}</h3>
+            <div class="block is-flex">
+                <div>
+                    <label class="label" for="id_logo">{% trans "Logo:" %}</label>
+                    {{ site_form.logo }}
+                </div>
+                <div>
+                    <label class="label" for="id_logo_small">{% trans "Logo small:" %}</label>
+                    {{ site_form.logo_small }}
+                </div>
+                <div>
+                    <label class="label" for="id_favicon">{% trans "Favicon:" %}</label>
+                    {{ site_form.favicon }}
+                </div>
             </div>
-            <div>
-                <label class="label" for="id_logo_small">{% trans "Logo small:" %}</label>
-                {{ site_form.logo_small }}
-            </div>
-            <div>
-                <label class="label" for="id_favicon">{% trans "Favicon:" %}</label>
-                {{ site_form.favicon }}
+
+            <h3 class="title is-5">{% trans "Themes" %}</h3>
+            <div class="block">
+                <label class="label" for="id_default_theme">
+                    {% trans "Default theme:" %}
+                </label>
+                <div class="select">
+                    {{ site_form.default_theme }}
+                </div>
             </div>
         </div>
     </section>

bookwyrm/templates/settings/themes.html

@@ -0,0 +1,140 @@
+{% extends 'settings/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Themes" %}{% endblock %}
+
+{% block header %}{% trans "Themes" %}{% endblock %}
+
+{% block breadcrumbs %}
+<a class="subtitle help is-link" href="{% url 'settings-site' %}/#display">
+    {% trans "Set instance default theme" %}
+</a>
+{% endblock %}
+
+{% block panel %}
+{% if success %}
+<div class="notification is-success is-light">
+    <span class="icon icon-check" aria-hidden="true"></span>
+    <span>
+        {% trans "Successfully added theme" %}
+    </span>
+</div>
+{% endif %}
+
+<section class="block">
+    <div class="notification content">
+        <h2 class="title is-5">{% trans "How to add a theme" %}</h2>
+        <ol>
+            <li>
+                {% trans "Copy the theme file into the <code>bookwyrm/static/css/themes</code> directory on your server from the command line." %}
+            </li>
+            <li>
+                {% trans "Run <code>./bw-dev compilescss</code>." %}
+            </li>
+            <li>
+                {% trans "Add the file name using the form below to make it available in the application interface." %}
+            </li>
+        </ol>
+    </div>
+</section>
+
+<section class="block content">
+    <h2 class="title is-4">{% trans "Add theme" %}</h2>
+
+    {% if theme_form.errors %}
+    <div class="notification is-danger is-light">
+        <span class="icon icon-x" aria-hidden="true"></span>
+        <span>
+            {% trans "Unable to save theme" %}
+        </span>
+    </div>
+    {% endif %}
+
+    <form
+        method="POST"
+        action="{% url 'settings-themes' %}"
+        class="box"
+        enctype="multipart/form-data"
+    >
+    {% if not choices %}
+    <div class="notification is-warning">
+        {% trans "No available theme files detected" %}
+    </div>
+    {% endif %}
+    <fieldset {% if not choices %}disabled{% endif %}>
+        {% csrf_token %}
+        <div class="columns">
+            <div class="column is-half">
+                <label class="label" for="id_name">
+                    {% trans "Theme name" %}
+                </label>
+                <div class="control">
+                    {{ theme_form.name }}
+                    {% include 'snippets/form_errors.html' with errors_list=theme_form.name.errors id="desc_name" %}
+                </div>
+            </div>
+
+            <div class="column">
+                <label class="label" for="id_path">
+                    {% trans "Theme filename" %}
+                </label>
+                <div class="control">
+                    <div class="select">
+                        <select
+                            name="path"
+                            aria-describedby="desc_path"
+                            class=""
+                            id="id_path"
+                        >
+                            {% for choice in choices %}
+                            <option value="{{ choice }}">
+                                {{ choice }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    {% include 'snippets/form_errors.html' with errors_list=theme_form.path.errors id="desc_path" %}
+                </div>
+            </div>
+        </div>
+
+        <button type="submit" class="button">{% trans "Add theme" %}</button>
+    </fieldset>
+    </form>
+</section>
+
+<section class="block content">
+    <h2 class="title is-4">{% trans "Available Themes" %}</h2>
+    <div class="table-container">
+        <table class="table is-striped">
+            <tr>
+                <th>
+                    {% trans "Theme name" %}
+                </th>
+                <th>
+                    {% trans "File" %}
+                </th>
+                <th>
+                    {% trans "Actions" %}
+                </th>
+            </tr>
+            {% for theme in themes %}
+            <tr>
+                <td>{{ theme.name }}</td>
+                <td><code>{{ theme.path }}</code></td>
+                <td>
+                    <form method="POST" action="{% url 'settings-themes-delete' theme.id %}">
+                        {% csrf_token %}
+                        <button type="submit" class="button is-danger is-light is-small">
+                            <span class="icon icon-x" aria-hideen="true"></span>
+                            <span>{% trans "Remove theme" %}</span>
+                        </button>
+                    </form>
+                </td>
+            </tr>
+            {% endfor %}
+        </table>
+    </div>
+</section>
+
+{% endblock %}

bookwyrm/templates/snippets/announcement.html

@@ -1,7 +1,7 @@
 {% load humanize %}{% load i18n %}{% load utilities %}
 {% with announcement.id|uuid as uuid %}
 <aside
-        class="notification mb-1 p-3{% if not admin_mode %} is-hidden{% endif %} transition-y has-background-{{ announcement.display_type }}"
+        class="notification mb-1 p-3{% if not admin_mode %} is-hidden{% endif %} transition-y {% if announcement.display_type %}has-background-{{ announcement.display_type }}{% endif %}"
     {% if not admin_mode %}data-hide="hide_announcement_{{ announcement.id }}"{% endif %}
 >
     <details>

bookwyrm/templates/snippets/status/layout.html

@@ -69,7 +69,6 @@
 
 {% block card-bonus %}
 {% if request.user.is_authenticated and not moderation_mode and not no_interact %}
-{% with status.id|uuid as uuid %}
 <section class="reply-panel is-hidden" id="show_comment_{{ status.id }}">
     <div class="card-footer">
         <div class="card-footer-item">
@@ -77,6 +76,5 @@
         </div>
     </div>
 </section>
-{% endwith %}
 {% endif %}
 {% endblock %}

bookwyrm/templates/snippets/suggested_users.html

@@ -11,7 +11,7 @@
                 <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
             </a>
             {% include 'snippets/follow_button.html' with user=user minimal=True %}
-            {% if user.mutuals %}
+            {% if user.mutuals and not user.hide_follows %}
             <p class="help">
                 {% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
                 {{ mutuals }} follower you follow

bookwyrm/templates/user/user_preview.html

@@ -28,16 +28,22 @@
 
             {% elif request.user.is_authenticated %}
 
-                {% mutuals_count user as mutuals %}
-                <a href="{% url 'user-followers' user|username %}">
-                    {% if mutuals %}
-                        {% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %}
-                    {% elif request.user in user.following.all %}
-                    {% trans "Follows you" %}
-                    {% else %}
-                    {% trans "No followers you follow" %}
+                {% if user.hide_follows %}
+                    {% if request.user in user.following.all %}
+                        {% trans "Follows you" %}
                     {% endif %}
-                </a>
+                {% else %}
+                    {% mutuals_count user as mutuals %}
+                    <a href="{% url 'user-followers' user|username %}">
+                        {% if mutuals %}
+                            {% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %}
+                        {% elif request.user in user.following.all %}
+                        {% trans "Follows you" %}
+                        {% else %}
+                        {% trans "No followers you follow" %}
+                        {% endif %}
+                    </a>
+                {% endif %}
 
             {% endif %}
         </p>