Browse Source

Settings sub-pages: add link back to main page

merge-requests/64/head
Deimos 6 years ago
parent
commit
177ce32e50
  1. 12
      tildes/tildes/templates/base_settings.jinja2
  2. 4
      tildes/tildes/templates/settings_account_recovery.jinja2
  3. 4
      tildes/tildes/templates/settings_bio.jinja2
  4. 4
      tildes/tildes/templates/settings_comment_visits.jinja2
  5. 4
      tildes/tildes/templates/settings_filters.jinja2
  6. 12
      tildes/tildes/templates/settings_password_change.jinja2
  7. 4
      tildes/tildes/templates/settings_two_factor.jinja2

12
tildes/tildes/templates/base_settings.jinja2

@ -0,0 +1,12 @@
{# Copyright (c) 2019 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base_no_sidebar.jinja2' %}
{% block content %}
{% block settings %}{% endblock %}
<div class="divider"></div>
<a href="/settings">Back to main Settings page</a>
{% endblock %}

4
tildes/tildes/templates/settings_account_recovery.jinja2

@ -1,13 +1,13 @@
{# Copyright (c) 2018 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base_no_sidebar.jinja2' %}
{% extends 'base_settings.jinja2' %}
{% block title %}Set up account recovery{% endblock %}
{% block main_heading %}Set up account recovery{% endblock %}
{% block content %}
{% block settings %}
<p>In order to support account recovery while maximizing user privacy, Tildes's recovery process is a bit unusual.</p>
<p>The email address you enter below will be cryptographically hashed (using <a href="https://en.wikipedia.org/wiki/Argon2">Argon2</a>) and only the hash stored. <strong>Your actual address is not stored</strong>, so it is impossible for anyone to see what it is or use it to send you email, and your address can't be leaked (due to a data breach, account compromise, etc.).</p>

4
tildes/tildes/templates/settings_bio.jinja2

@ -1,7 +1,7 @@
{# Copyright (c) 2019 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base_no_sidebar.jinja2' %}
{% extends 'base_settings.jinja2' %}
{% from 'macros/forms.jinja2' import markdown_textarea %}
@ -9,7 +9,7 @@
{% block main_heading %}Edit your user bio{% endblock %}
{% block content %}
{% block settings %}
<form
method="post"
name="user-bio"

4
tildes/tildes/templates/settings_comment_visits.jinja2

@ -1,13 +1,13 @@
{# Copyright (c) 2018 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base_no_sidebar.jinja2' %}
{% extends 'base_settings.jinja2' %}
{% block title %}Toggle marking new comments{% endblock %}
{% block main_heading %}Toggle marking new comments{% endblock %}
{% block content %}
{% block settings %}
<figure>
<figcaption>How new comments are displayed</figcaption>
<img src="/images/mark-new-comments.png" alt="Examples of how new comments are displayed">

4
tildes/tildes/templates/settings_filters.jinja2

@ -1,13 +1,13 @@
{# Copyright (c) 2018 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base_no_sidebar.jinja2' %}
{% extends 'base_settings.jinja2' %}
{% block title %}Define topic tag filters{% endblock %}
{% block main_heading %}Define topic tag filters{% endblock %}
{% block content %}
{% block settings %}
<p>You can configure a list of filtered topic tags below. If a topic has <em>any</em> of these tags, it will be filtered out (not shown) by default, but you can toggle the filtering off to see a full list.</p>
<p>These filters are <em>global</em> and will apply both to your home page as well as inside specific groups.</p>

12
tildes/tildes/templates/settings_password_change.jinja2

@ -1,13 +1,13 @@
{# Copyright (c) 2018 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base.jinja2' %}
{% extends 'base_settings.jinja2' %}
{% block title %}Change your password{% endblock %}
{% block main_heading %}Change your password{% endblock %}
{% block content %}
{% block settings %}
<form
class="form-narrow"
name="password-change"
@ -35,10 +35,8 @@
<button class="btn btn-primary" type="submit">Change password</button>
</div>
</form>
{% endblock %}
{% block sidebar %}
<dl>
{% include 'includes/password_restrictions.jinja2' %}
</dl>
<div class="divider"></div>
{% include 'includes/password_restrictions.jinja2' %}
{% endblock %}

4
tildes/tildes/templates/settings_two_factor.jinja2

@ -1,13 +1,13 @@
{# Copyright (c) 2018 Tildes contributors <code@tildes.net> #}
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends 'base_no_sidebar.jinja2' %}
{% extends 'base_settings.jinja2' %}
{% block title %}Set up two-factor authentication{% endblock %}
{% block main_heading %}Set up two-factor authentication{% endblock %}
{% block content %}
{% block settings %}
{% if request.user.two_factor_enabled %}
<p>You already have two-factor authentication enabled. To disable it, enter a code from your authenticator device below and click the button. If you do not have access to your authenticator device, enter a backup code.</p>

Loading…
Cancel
Save