gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

Merge branch 'hotfix/0.11.5' into production

Browse source
This commit is contained in:
Jan Dittberner 2018-12-26 13:34:48 +01:00
commit bfcabe664f
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnuviechadmin/gnuviechadmin/settings/base.py
View file

@ -254,7 +254,6 @@ ALLAUTH_APPS = (
'allauth.socialaccount.providers.google', 'allauth.socialaccount.providers.google',
'allauth.socialaccount.providers.linkedin_oauth2', 'allauth.socialaccount.providers.linkedin_oauth2',
'allauth.socialaccount.providers.twitter', 'allauth.socialaccount.providers.twitter',
'allauth.socialaccount.providers.xing',
) )
# Apps specific for this project go here. # Apps specific for this project go here.

2
gnuviechadmin/templates/socialaccount/connections.html
View file

@ -26,7 +26,7 @@
<tr> <tr>
<td><input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/></td> <td><input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/></td>
<td><label for="id_account_{{base_account.id}}"><i <td><label for="id_account_{{base_account.id}}"><i
class="fa fa-{% if provider == 'twitter' %}twitter{% elif provider == 'google' %}google{% elif provider == 'xing' %}xing{% elif provider == 'linkedin_oauth2' %}linkedin{% endif %}"></i> <span class="socialaccount_provider {{provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span></label></td> class="fa fa-{% if provider == 'twitter' %}twitter{% elif provider == 'google' %}google{% elif provider == 'linkedin_oauth2' %}linkedin{% endif %}"></i> <span class="socialaccount_provider {{provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span></label></td>
<td>{{ account }}</td> <td>{{ account }}</td>
</tr> </tr>
{% endwith %} {% endwith %}

2
gnuviechadmin/templates/socialaccount/snippets/provider_list.html
View file

@ -15,7 +15,7 @@
<a title="{{provider.name}}" <a title="{{provider.name}}"
class="socialaccount_provider {{provider.id}}" class="socialaccount_provider {{provider.id}}"
href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"><i href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"><i
class="fa fa-{% if provider.id == 'twitter' %}twitter{% elif provider.id == 'google' %}google{% elif provider.id == 'xing' %}xing{% elif provider.id == 'linkedin_oauth2' %}linkedin{% endif %}"></i>&nbsp;{{provider.name}}</a> class="fa fa-{% if provider.id == 'twitter' %}twitter{% elif provider.id == 'google' %}google{% elif provider.id == 'linkedin_oauth2' %}linkedin{% endif %}"></i>&nbsp;{{provider.name}}</a>
</li> </li>
{% endfor %} {% endfor %}