Skip to content

Show "Last login" label next to the login method #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Show "Last login" label next to the login method #622

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2042860
Show "Last login" label next to the login method
humitos Jul 2, 2025
0382b81
Automatically switch to Email tab when last method was email
humitos Jul 8, 2025
05e535e
Use a tooltip
humitos Jul 14, 2025
6c0da56
Merge branch 'main' of github.com:readthedocs/ext-theme into humitos/…
humitos Jul 14, 2025
2f839e2
Handle `last_login_method` and `login_tab`
humitos Jul 14, 2025
af7c6e6
Rename
humitos Jul 14, 2025
a089234
Tooltip position
humitos Jul 14, 2025
5ea2c4e
Bring back the beta label
humitos Jul 14, 2025
b57e447
Handle click on buttons to save the cookie
humitos Jul 14, 2025
8a5b4fa
Small linting issues
humitos Jul 14, 2025
688119a
Always show it at the right
humitos Jul 14, 2025
5bece7f
Improve code that removes the `visible` property
humitos Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions readthedocsext/theme/templates/account/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
{% endif %}
{% endblock content_title_text %}

{% block head_scripts %}
{{ block.super }}

<script type="text/javascript">
// TODO: where should we put this code?
const last_login_method = "{{ last_login_method }}";
if (window.location.pathname == "/accounts/login/" && last_login_method == "email") {
history.pushState({}, "", "#/email/");
}
</script>
{% endblock head_scripts %}

{% block content_body %}
{% get_providers as socialaccount_providers %}

Expand Down Expand Up @@ -47,6 +59,9 @@
{% block authentication_email_text %}
{% trans "Email" %}
{% endblock authentication_email_text %}
{% if last_login_method == "email" %}
<div class="ui teal label">Last used</div>
{% endif %}
</a>

{% if USE_ORGANIZATIONS %}
Expand Down
10 changes: 9 additions & 1 deletion readthedocsext/theme/templates/socialaccount/snippets/provider_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
{{ verbiage }} {{ provider_name }}
{% endblocktrans %}
</a>
{% if last_login_method == "github" %}
<span class="ui compact small teal basic label">Last used</span>
{% endif %}
</li>
<div class="ui tiny modal" data-modal-id="github-select">
<div class="header">
Expand All @@ -48,11 +51,16 @@
Our GitHub OAuth app
{% endblocktrans %}
<span class="ui compact small basic label">Default</span>
{% if last_login_method == "github" %}
<span class="ui compact small teal basic label">Last used</span>
{% endif %}
{% elif provider.id == "githubapp" %}
{% blocktrans trimmed %}
Our GitHub App
{% endblocktrans %}
<span class="ui violet compact small basic label">Beta</span>
{% if last_login_method == "githubapp" %}
<span class="ui compact small teal basic label">Last used</span>
{% endif %}
{% endif %}
</div>
<div class="description">
Expand Down