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

Show connect buttons for installed apps only #3394

Merged
merged 7 commits into from
Dec 14, 2017
Merged

Show connect buttons for installed apps only #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
49d3542
Show connect buttons for installed apps only
humitos Dec 11, 2017
4b2e3cc
Fix lint
humitos Dec 11, 2017
f2b8db6
Add missing CSS class used at .com
humitos Dec 11, 2017
671623b
Use proper GitLab icon from FontAwesome
humitos Dec 11, 2017
85d4268
Force tuple but without breaking prospector
humitos Dec 11, 2017
c631dc4
Do not loose the next attribute
humitos Dec 12, 2017
416d8d2
Fix styling
agjohnson Dec 12, 2017
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
5 changes: 1 addition & 4 deletions media/css/core.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,19 +690,16 @@ div.project-import-remote button.remote-sync:before {
content: "\f021";
}

div.project-import-remote form.import-connect-github button:before,
a.socialaccount-provider.github:before {
font-family: FontAwesome;
content: "\f09b";
}

div.project-import-remote form.import-connect-gitlab button:before,
a.socialaccount-provider.gitlab:before {
font-family: FontAwesome;
content: "\f1d3";
content: "\f296";
}

div.project-import-remote form.import-connect-bitbucket button:before,
a.socialaccount-provider.bitbucket:before,
a.socialaccount-provider.bitbucket_oauth2:before {
font-family: FontAwesome;
Expand Down
Binary file modified readthedocs/core/static/core/font/Inconsolata-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified readthedocs/core/static/core/font/Inconsolata-Regular.ttf
View file
Open in desktop
Binary file not shown.
26 changes: 18 additions & 8 deletions readthedocs/projects/static-src/projects/css/import.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,25 @@ div.project-import-remote {
}
}

form.import-connect {
ul.socialaccount_providers {
overflow: auto;
display: inline;

button {
display: inline;
margin-bottom: .5em;
font-size: 1em;
font-weight: normal;
display: block;
list-style: none;

li {
margin-top: 0.5em;
display: block;
overflow: auto;
text-align: center;

a.socialaccount-provider {
float: none;
display: inline-block;
margin-bottom: 0.5em;
margin-top: 0.5em;
font-size: 1em;
font-weight: normal;
}
}
}
}
Expand Down
19 changes: 14 additions & 5 deletions readthedocs/projects/static/projects/css/import.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,22 @@ div.project-import-remote li.remote-repo ul.remote-repo-menu {
top: 10px;
right: 10px;
}
div.project-import-remote form.import-connect {
div.project-import-remote ul.socialaccount_providers {
overflow: auto;
display: inline;
display: block;
list-style: none;
}
div.project-import-remote ul.socialaccount_providers li {
margin-top: 0.5em;
display: block;
overflow: auto;
text-align: center;
}
div.project-import-remote form.import-connect button {
display: inline;
margin-bottom: .5em;
div.project-import-remote ul.socialaccount_providers li a.socialaccount-provider {
float: none;
display: inline-block;
margin-bottom: 0.5em;
margin-top: 0.5em;
font-size: 1em;
font-weight: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/restapi/views/footer_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def get_version_compare_data(project, base_version=None):
}
if highest_version_obj:
ret_val['url'] = highest_version_obj.get_absolute_url()
ret_val['slug'] = highest_version_obj.slug,
ret_val['slug'] = (highest_version_obj.slug,)
if base_version and base_version.slug != LATEST:
try:
base_version_comparable = parse_version_failsafe(
Expand Down
37 changes: 4 additions & 33 deletions readthedocs/templates/projects/project_import.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,41 +93,12 @@ <h1>{% trans "Import a Repository" %}</h1>
{% endblocktrans %}
</p>

<div class="project-import-providers">
<form
method="get"
action="{% provider_login_url "github" %}"
class="import-connect import-connect-github">
<button>
{% trans "Connect to GitHub" %}
</button>
<input type="hidden" name="process" value="connect">
<input type="hidden" name="next" value="/dashboard/import/">
</form>

<form
method="get"
action="{% provider_login_url "gitlab" %}"
class="import-connect import-connect-gitlab">
<button>
{% trans "Connect to GitLab" %}
</button>
<input type="hidden" name="process" value="connect">
<input type="hidden" name="next" value="/dashboard/import/">
</form>

<form
method="get"
action="{% provider_login_url "bitbucket_oauth2" %}"
class="import-connect import-connect-bitbucket">
<button>
{% trans "Connect to Bitbucket" %}
</button>
<input type="hidden" name="process" value="connect">
<input type="hidden" name="next" value="/dashboard/import/">
</form>
<div class="project-import-providers">
<ul class="socialaccount_providers">
{% include "socialaccount/snippets/provider_list.html" with process="connect" next="/dashboard/import/" %}
</ul>
</div>

{% endif %}
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/templates/socialaccount/connections.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</div>

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

{% include "socialaccount/snippets/login_extra.html" %}
Expand Down
6 changes: 3 additions & 3 deletions readthedocs/templates/socialaccount/snippets/provider_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
{% for brand in provider.get_brands %}
<li>
<a title="{{ brand.name }}"
class="socialaccount-provider {{ provider.id }} {{ brand.id }}"
href="{% provider_login_url provider.id openid=brand.openid_url process=process %}"
class="socialaccount-provider {{ provider.id }} {{ brand.id }} button"
href="{% provider_login_url provider.id openid=brand.openid_url process=process next=next %}"
>
{% blocktrans with brand_name=brand.name %}
Connect to {{ brand_name }}
Expand All @@ -22,7 +22,7 @@
<li>
<a title="{{ provider.name }}"
class="socialaccount-provider {{ provider.id }} button"
href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"
href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params next=next %}"
>
{% blocktrans with provider_name=provider.name %}
Connect to {{ provider_name }}
Expand Down