Merge branch 'main' into 253-user-post-privacy-v2

bookwyrm/templates/preferences/blocks.html

@@ -1,21 +1,24 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Blocked Users" %}{{ author.name }}{% endblock %}
 
 {% block header %}
-Blocked Users
+{% trans "Blocked Users" %}
 {% endblock %}
 
 {% block panel %}
 {% if not request.user.blocks.exists %}
-<p>No users currently blocked.</p>
+<p>{% trans "No users currently blocked." %}</p>
 {% else %}
 <ul>
 {% for user in request.user.blocks.all %}
     <li class="is-flex">
         <p>
-            {% include 'snippets/avatar.html' with user=user %} {% include 'snippets/username.html' with user=user %}
+            <a href="{{ user.local_path }}">{% include 'snippets/avatar.html' with user=user %} {{ user.display_name }}</a>
         </p>
         <p class="mr-2">
-            {% include 'snippets/block_button.html' with user=user %}
+            {% include 'snippets/block_button.html' with user=user blocks=True %}
         </p>
     </li>
 {% endfor %}

bookwyrm/templates/preferences/change_password.html

@@ -1,19 +1,23 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
 {% block header %}
-Change Password
+{% trans "Change Password" %}
 {% endblock %}
 
 {% block panel %}
-<form name="edit-profile" action="/change-password/" method="post" enctype="multipart/form-data">
+<form name="edit-profile" action="{% url 'prefs-password' %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <div class="block">
-        <label class="label" for="id_password">New password:</label>
+        <label class="label" for="id_password">{% trans "New password:" %}</label>
         <input type="password" name="password" maxlength="128" class="input" required="" id="id_password">
     </div>
     <div class="block">
-        <label class="label" for="id_confirm_password">Confirm password:</label>
+        <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
         <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
     </div>
-    <button class="button is-primary" type="submit">Change password</button>
+    <button class="button is-primary" type="submit">{% trans "Change Password" %}</button>
 </form>
 {% endblock %}

bookwyrm/templates/preferences/delete_user.html

@@ -0,0 +1,30 @@
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Delete Account" %}{% endblock %}
+
+{% block header %}
+{% trans "Delete Account" %}
+{% endblock %}
+
+{% block panel %}
+<div class="block">
+    <h2 class="title is-4">{% trans "Permanently delete account" %}</h2>
+    <p class="notification is-danger is-light">
+        {% trans "Deleting your account cannot be undone. The username will not be available to register in the future." %}
+    </p>
+
+    <form name="delete-user" action="{% url 'prefs-delete' %}" method="post">
+        {% csrf_token %}
+        <div class="field">
+            <label class="label" for="id_password">{% trans "Confirm password:" %}</label>
+            <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required>
+            {% for error in form.password.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </div>
+        <button type="submit" class="button is-danger">{% trans "Delete Account" %}</button>
+    </form>
+</div>
+{% endblock %}
+

bookwyrm/templates/preferences/edit_user.html

@@ -1,6 +1,10 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Edit Profile" %}{% endblock %}
+
 {% block header %}
-Edit Profile
+{% trans "Edit Profile" %}
 {% endblock %}
 
 {% block panel %}
@@ -10,45 +14,65 @@ Edit Profile
 <form name="edit-profile" action="{% url 'prefs-profile' %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <div class="block">
-        <label class="label" for="id_avatar">Avatar:</label>
+        <label class="label" for="id_avatar">{% trans "Avatar:" %}</label>
         {{ form.avatar }}
         {% for error in form.avatar.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
     <div class="block">
-        <label class="label" for="id_name">Display name:</label>
+        <label class="label" for="id_name">{% trans "Display name:" %}</label>
         {{ form.name }}
         {% for error in form.name.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
     <div class="block">
-        <label class="label" for="id_summary">Summary:</label>
+        <label class="label" for="id_summary">{% trans "Summary:" %}</label>
         {{ form.summary }}
         {% for error in form.summary.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
     <div class="block">
-        <label class="label" for="id_email">Email address:</label>
+        <label class="label" for="id_email">{% trans "Email address:" %}</label>
         {{ form.email }}
         {% for error in form.email.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
+    <div class="block">
+        <label class="checkbox label" for="id_show_goal">
+            {% trans "Show set reading goal prompt in feed:" %}
+            {{ form.show_goal }}
+        </label>
+    </div>
     <div class="block">
         <label class="checkbox label" for="id_manually_approves_followers">
-            Manually approve followers:
+            {% trans "Manually approve followers:" %}
             {{ form.manually_approves_followers }}
         </label>
     </div>
     <div class="block">
         <label class="label" for="id_default_post_privacy">
-            Default post privacy:
-            {{form.default_post_privacy}}
+            {% trans "Default post privacy:" %}
+            {{ form.default_post_privacy }}
         </label>
     </div>
-    <button class="button is-primary" type="submit">Save</button>
+    <div class="block">
+        <label class="checkbox label" for="id_discoverable">
+            {% trans "Show this account in suggested users:" %}
+            {{ form.discoverable }}
+        </label>
+        {% url 'directory' as path %}
+        <p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
+    </div>
+    <div class="block">
+        <label class="label" for="id_preferred_timezone">{% trans "Preferred Timezone: " %}</label>
+        <div class="select">
+            {{ form.preferred_timezone }}
+        </div>
+    </div>
+    <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
 </form>
 {% endblock %}

bookwyrm/templates/preferences/layout.html

@@ -0,0 +1,39 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+{% block content %}
+
+<header class="block column is-offset-one-quarter pl-1">
+    <h1 class="title">{% block header %}{% endblock %}</h1>
+</header>
+
+<div class="block columns">
+    <nav class="menu column is-one-quarter">
+        <h2 class="menu-label">{% trans "Account" %}</h2>
+        <ul class="menu-list">
+            <li>
+                {% url 'prefs-profile' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
+            </li>
+            <li>
+                {% url 'prefs-password' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
+            </li>
+            <li>
+                {% url 'prefs-delete' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Delete Account" %}</a>
+            </li>
+        </ul>
+        <h2 class="menu-label">{% trans "Relationships" %}</h2>
+        <ul class="menu-list">
+            <li>
+                {% url 'prefs-block' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked Users" %}</a>
+            </li>
+        </ul>
+    </nav>
+    <div class="column content">
+        {% block panel %}{% endblock %}
+    </div>
+</div>
+
+{% endblock %}

bookwyrm/templates/preferences/preferences_layout.html

@@ -1,31 +0,0 @@
-{% extends 'layout.html' %}
-{% block content %}
-
-<header class="block column is-offset-one-quarter pl-1">
-    <h1 class="title">{% block header %}{% endblock %}</h1>
-</header>
-
-<div class="block columns">
-    <nav class="menu column is-one-quarter">
-        <h2 class="menu-label">Account</h2>
-        <ul class="menu-list">
-            <li>
-                <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>Profile</a>
-            </li>
-            <li>
-                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>Change password</a>
-            </li>
-        </ul>
-        <h2 class="menu-label">Relationships</h2>
-        <ul class="menu-list">
-            <li>
-                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>Blocked users</a>
-            </li>
-        </ul>
-    </nav>
-    <div class="column content">
-        {% block panel %}{% endblock %}
-    </div>
-</div>
-
-{% endblock %}