Skip to content
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

UI updates to Connected Accounts #9891

Merged
merged 1 commit into from
Jan 12, 2023
+54 −7
Merged

UI updates to Connected Accounts #9891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions readthedocs/projects/static-src/projects/css/admin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,14 @@
content: "\f063";
}
}

.connected-services {
ul.socialaccount_providers {
li {
button.socialaccount-provider {
float: none;
}
}
}

}
3 changes: 3 additions & 0 deletions readthedocs/projects/static/projects/css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@
#content .module-list.automation-rules .automation-rule button.automation-rule-down:before {
content: "\f063";
}
.connected-services ul.socialaccount_providers li button.socialaccount-provider {
float: none;
}
47 changes: 40 additions & 7 deletions readthedocs/templates/socialaccount/connections.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{% extends "profiles/base_profile_edit.html" %}

{% load i18n %}
{% load i18n static %}

{% block title %}{% trans "Connected Services" %}{% endblock %}

{% block extra_links %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "projects/css/admin.css" %}" />
{% endblock %}

{% block edit_content_header %} {% trans "Connected Services" %} {% endblock %}

{% block profile-admin-social-accounts %}active{% endblock %}
Expand All @@ -12,6 +17,25 @@

<div class="module connected-services">
<div class="module-wrapper">

<p class="help_text">
{% blocktrans trimmed %}
On this page,
you can manage the integration with your Git provider(s) that enables automatic import and configuration of your repositories.
<a href="https://docs.readthedocs.io/en/stable/connected-accounts.html" target="_blank">Read our documentation page about connecting Git providers.</a>
{% endblocktrans %}
</p>

<ul class="socialaccount_providers">
{% include "socialaccount/snippets/provider_list.html" with process="connect" next="" %}
</ul>

</div>
</div>
<div class="module connected-services">
<div class="module-wrapper">
<h3>{% trans "Active connections" %}</h3>

<p>
{% blocktrans trimmed %}
The following services are currently connected to your account:
Expand Down Expand Up @@ -74,13 +98,22 @@
{% endif %}

</div>
</div>
</div>

<ul class="socialaccount_providers">
{% include "socialaccount/snippets/provider_list.html" with process="connect" next="" %}
</ul>
{% if form.accounts %}
<p class="help_text">
{% blocktrans trimmed %}
Note: If you press the <strong>Disconnect</strong> button to disconnect a service,
you should also visit your Git Provider in order to
delete the OAuth connection of Read the Docs.
On GitHub, this is located in <code>Settings > Applications > Authorized OAuth Apps</code>.
{% endblocktrans %}
</p>
{% endif %}

{% include "socialaccount/snippets/login_extra.html" %}

{% include "socialaccount/snippets/login_extra.html" %}
</div>

</div>

{% endblock %}