@@ -217,44 +217,62 @@ <h3 class="ui small header">{% trans "Migrate all projects" %}</h3>
217
217
218
218
< a class ="ui button " href ="?step=revoke "> {% trans "Next" %}</ a >
219
219
{% elif step == "revoke" %}
220
- < p >
220
+ < div class ="ui small warning message ">
221
+ < i class ="fad fa-warning icon "> </ i >
221
222
{% blocktrans trimmed %}
222
- Revoke access to our old GitHub OAuth app.
223
- You'll be redirected to GitHub, where you need to click on "Revoke access" .
223
+ During the beta period, we don't recommend revoking access to our old GitHub OAuth app.
224
+ You will be reminded to complete this step after the beta period ends .
224
225
{% endblocktrans %}
225
- </ p >
226
-
227
- {% if has_projects_pending_migration and not step_revoke_completed %}
228
- < div class ="ui small warning message ">
229
- < i class ="fad fa-warning icon "> </ i >
230
- {% blocktrans trimmed with migrate_step="?step=migrate" manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
231
- You have projects that need to be < a href ="{{ migrate_step }} "> migrated</ a > .
232
- If you revoke access now, you'll need to < a href ="{{ manual_migration_docs }} "> manually migrate</ a > them.
226
+ </ div >
227
+ < div class ="ui disabled basic segment ">
228
+ < p >
229
+ {% blocktrans trimmed %}
230
+ Revoke access to our old GitHub OAuth app.
231
+ You'll be redirected to GitHub, where you need to click on "Revoke access".
233
232
{% endblocktrans %}
234
- </ div >
235
- {% endif %}
233
+ </ p >
236
234
237
- {% include "profiles/partials/github_oauth_revoke_list.html" with objects=old_github_accounts current_page=request.get_full_path %}
235
+ {% if has_projects_pending_migration and not step_revoke_completed %}
236
+ < div class ="ui small warning message ">
237
+ < i class ="fad fa-warning icon "> </ i >
238
+ {% blocktrans trimmed with migrate_step="?step=migrate" manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
239
+ You have projects that need to be < a href ="{{ migrate_step }} "> migrated</ a > .
240
+ If you revoke access now, you'll need to < a href ="{{ manual_migration_docs }} "> manually migrate</ a > them.
241
+ {% endblocktrans %}
242
+ </ div >
243
+ {% endif %}
244
+
245
+ {% include "profiles/partials/github_oauth_revoke_list.html" with objects=old_github_accounts current_page=request.get_full_path %}
246
+ </ div >
238
247
239
248
< div class ="ui divider "> </ div >
240
249
< a class ="ui button {% if not step_revoke_completed %}disabled{% endif %} "
241
250
href ="?step=disconnect "> {% trans "Next" %}</ a >
242
251
{% elif step == "disconnect" %}
243
- < p >
252
+ < div class ="ui small warning message ">
253
+ < i class ="fad fa-warning icon "> </ i >
244
254
{% blocktrans trimmed %}
245
- Disconnect the old GitHub OAuth app from your Read the Docs account.
246
- {% endblocktrans %}
247
- </ p >
248
-
249
- < div class ="ui message info ">
250
- < i class ="fad fa-info-circle icon "> </ i >
251
- {% blocktrans trimmed with manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
252
- After disconnecting the old GitHub OAuth app, you won't be able to see this page again.
253
- If you have projects that need to be migrated, you'll need to < a href ="{{ manual_migration_docs }} "> manually migrate</ a > them.
255
+ During the beta period, we don't recommend disconnecting your account from our old GitHub OAuth app.
256
+ You will be reminded to complete this step after the beta period ends.
254
257
{% endblocktrans %}
255
258
</ div >
259
+ < div class ="ui disabled basic segment ">
260
+ < p >
261
+ {% blocktrans trimmed %}
262
+ Disconnect the old GitHub OAuth app from your Read the Docs account.
263
+ {% endblocktrans %}
264
+ </ p >
256
265
257
- {% include "profiles/partials/github_oauth_disconnect_list.html" with objects=old_github_accounts %}
266
+ < div class ="ui message info ">
267
+ < i class ="fad fa-info-circle icon "> </ i >
268
+ {% blocktrans trimmed with manual_migration_docs="https://docs.readthedocs.com/platform/stable/reference/git-integration.html#manually-migrating-a-project" %}
269
+ After disconnecting the old GitHub OAuth app, you won't be able to see this page again.
270
+ If you have projects that need to be migrated, you'll need to < a href ="{{ manual_migration_docs }} "> manually migrate</ a > them.
271
+ {% endblocktrans %}
272
+ </ div >
273
+
274
+ {% include "profiles/partials/github_oauth_disconnect_list.html" with objects=old_github_accounts %}
275
+ </ div >
258
276
{% endif %}
259
277
</ div >
260
278
</ div >
0 commit comments