Show connect buttons for installed apps only #3394
Conversation
Instead of hardcode the button/form for each of the services, we share the ``provider_list.html`` file used in the "Connected Services" tab from "Account Settings". This template shows only buttons for the Services installed in the database.
|
Could you post some screenshots of the two changes? |
|
Import project
Settings page
|
media/css/core.css
Outdated
| 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"; |
There was a problem hiding this comment.
\f296 should be for gitlab
http://fontawesome.io/icon/gitlab/
| @@ -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 | |||
There was a problem hiding this comment.
This looks like an unrelated bug?
There was a problem hiding this comment.
Ha! Yeah. I don't understand how this passed the test in the PR that was merged :/
| </form> | ||
| <div class="project-import-providers"> | ||
| <ul class="socialaccount_providers"> | ||
| {% include "socialaccount/snippets/provider_list.html" with process="connect" %} |
There was a problem hiding this comment.
I don't see this file in the commit, did it already exist?
There was a problem hiding this comment.
Oh I see it below -- is it also used somewhere else?
There was a problem hiding this comment.
Yes, it is used in the /accounts/social/connections/ page, under the admin settings.
There was a problem hiding this comment.
We do lose the next parameter here, correct? This will likely just redirect users back to the connection page. Is redirecting to the import page important here?
There was a problem hiding this comment.
Good catch! I didn't realize this.
Yes, I think it's important since you are at the import page. I'd like to connect my account and import the my project immediately. I'm proposing a fix for this using the template tag: https://github.com/pennersr/django-allauth/blob/cfc5112bf474af2cbb16e4b4a36708e8949a2105/allauth/socialaccount/templatetags/socialaccount.py#L45
media/css/core.css
Outdated
| a.socialaccount-provider.gitlab:before { | ||
| font-family: FontAwesome; | ||
| content: "\f1d3"; | ||
| } | ||
|
|
||
| div.project-import-remote form.import-connect-bitbucket button:before, |
There was a problem hiding this comment.
What's the reason we're removing this styles?
There was a problem hiding this comment.
I removed these because the form is not used anymore (I removed them). So, I didn't want to leave orphans styles...
| </form> | ||
| <div class="project-import-providers"> | ||
| <ul class="socialaccount_providers"> | ||
| {% include "socialaccount/snippets/provider_list.html" with process="connect" %} |
There was a problem hiding this comment.
We do lose the next parameter here, correct? This will likely just redirect users back to the connection page. Is redirecting to the import page important here?
| div.project-import-remote form.import-connect button { | ||
| display: inline; | ||
| div.project-import-remote a.socialaccount-provider { | ||
| display: block; |
There was a problem hiding this comment.
These changes look to have some negative side effect on spacing and alignment. What prompted these changes? If we have to alter layout on one of the forms, that might be better.
There was a problem hiding this comment.
"I don't know CSS", so I don't have good reasons. I touched it a little, googled something and it looked it worked so I thought that I could propose it.
I'm totally 👍 on remove this and change it as you like/prefer/wish/etc.
There was a problem hiding this comment.
Also, missed this the first time. This is actually editing a compiled css file, the source is at readthedocs/projects/static-src/projects/css/import.less. I'm going to be working to unify our styling, and to get rid of our core.css file soon.
|
Updated the styles for the import list page:
|
Instead of hardcode the button/form for each of the services, we share
the
provider_list.htmlfile used in the "Connected Services" tabfrom "Account Settings".
This template shows only buttons for the Services installed in the
database.