diff --git a/readthedocsext/theme/templates/profiles/partials/github_oauth_disconnect_list.html b/readthedocsext/theme/templates/profiles/partials/github_oauth_disconnect_list.html index 72f4533b..6066df9f 100644 --- a/readthedocsext/theme/templates/profiles/partials/github_oauth_disconnect_list.html +++ b/readthedocsext/theme/templates/profiles/partials/github_oauth_disconnect_list.html @@ -23,7 +23,7 @@ action="{% url 'socialaccount_connections' %}"> {% csrf_token %} - diff --git a/readthedocsext/theme/templates/profiles/partials/github_oauth_revoke_list.html b/readthedocsext/theme/templates/profiles/partials/github_oauth_revoke_list.html index 2fa391c4..69150b35 100644 --- a/readthedocsext/theme/templates/profiles/partials/github_oauth_revoke_list.html +++ b/readthedocsext/theme/templates/profiles/partials/github_oauth_revoke_list.html @@ -43,7 +43,7 @@ {% else %} {% trans "Revoke" %} diff --git a/readthedocsext/theme/templates/profiles/private/migrate_to_gh_app.html b/readthedocsext/theme/templates/profiles/private/migrate_to_gh_app.html index 59998f52..61534210 100644 --- a/readthedocsext/theme/templates/profiles/private/migrate_to_gh_app.html +++ b/readthedocsext/theme/templates/profiles/private/migrate_to_gh_app.html @@ -217,44 +217,62 @@

{% trans "Migrate all projects" %}

{% trans "Next" %} {% elif step == "revoke" %} -

+

+ {% blocktrans trimmed %} - Revoke access to our old GitHub OAuth app. - You'll be redirected to GitHub, where you need to click on "Revoke access". + During the beta period, we don't recommend revoking access to our old GitHub OAuth app. + You will be reminded to complete this step after the beta period ends. {% endblocktrans %} -

- - {% if has_projects_pending_migration and not step_revoke_completed %} -
- - {% blocktrans trimmed with migrate_step="?step=migrate" manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %} - You have projects that need to be migrated. - If you revoke access now, you'll need to manually migrate them. +
+
+

+ {% blocktrans trimmed %} + Revoke access to our old GitHub OAuth app. + You'll be redirected to GitHub, where you need to click on "Revoke access". {% endblocktrans %} -

- {% endif %} +

- {% include "profiles/partials/github_oauth_revoke_list.html" with objects=old_github_accounts current_page=request.get_full_path %} + {% if has_projects_pending_migration and not step_revoke_completed %} +
+ + {% blocktrans trimmed with migrate_step="?step=migrate" manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %} + You have projects that need to be migrated. + If you revoke access now, you'll need to manually migrate them. + {% endblocktrans %} +
+ {% endif %} + + {% include "profiles/partials/github_oauth_revoke_list.html" with objects=old_github_accounts current_page=request.get_full_path %} +
{% trans "Next" %} {% elif step == "disconnect" %} -

+

+ {% blocktrans trimmed %} - Disconnect the old GitHub OAuth app from your Read the Docs account. - {% endblocktrans %} -

- -
- - {% blocktrans trimmed with manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %} - After disconnecting the old GitHub OAuth app, you won't be able to see this page again. - If you have projects that need to be migrated, you'll need to manually migrate them. + During the beta period, we don't recommend disconnecting your account from our old GitHub OAuth app. + You will be reminded to complete this step after the beta period ends. {% endblocktrans %}
+
+

+ {% blocktrans trimmed %} + Disconnect the old GitHub OAuth app from your Read the Docs account. + {% endblocktrans %} +

- {% include "profiles/partials/github_oauth_disconnect_list.html" with objects=old_github_accounts %} +
+ + {% blocktrans trimmed with manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %} + After disconnecting the old GitHub OAuth app, you won't be able to see this page again. + If you have projects that need to be migrated, you'll need to manually migrate them. + {% endblocktrans %} +
+ + {% include "profiles/partials/github_oauth_disconnect_list.html" with objects=old_github_accounts %} +
{% endif %}