Merge e64893e into 603aeff

rdmorganiser · Feb 7, 2020 · 0c35894 · 0c35894
2 parents 603aeff + e64893e
commit 0c35894
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/rdmo/accounts/adapter.py b/rdmo/accounts/adapter.py
@@ -1,9 +1,15 @@
-from django.conf import settings
-
 from allauth.account.adapter import DefaultAccountAdapter
+from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+from django.conf import settings
 
 
 class AccountAdapter(DefaultAccountAdapter):
 
     def is_open_for_signup(self, request):
         return settings.ACCOUNT_SIGNUP
+
+
+class SocialAccountAdapter(DefaultSocialAccountAdapter):
+
+    def is_open_for_signup(self, request, sociallogin):
+        return settings.SOCIALACCOUNT_SIGNUP
diff --git a/rdmo/accounts/static/accounts/img/orcid-signin.png b/rdmo/accounts/static/accounts/img/orcid-signin.png
diff --git a/rdmo/accounts/templates/socialaccount/snippets/provider_list.html b/rdmo/accounts/templates/socialaccount/snippets/provider_list.html
@@ -24,7 +24,7 @@
         {% if provider.id != 'orcid' %}
         <span class="fa fa-{{provider.id}} fa-2x"></span>
         {% else %}
-        <span class="socialaccount_provider_name">{{ provider.name }}</span>
+        <img class="orcid-signin" src="{% static 'accounts/img/orcid-signin.png' %}" alt="ORCID sign in" />
         {% endif %}
     </a>
 </li>

diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
@@ -99,6 +99,12 @@
 ACCOUNT_PASSWORD_MIN_LENGTH = 4
 ACCOUNT_EMAIL_MAX_LENGTH = 190
 
+ACCOUNT_ADAPTER = 'rdmo.accounts.adapter.AccountAdapter'
+
+SOCIALACCOUNT_ADAPTER = 'rdmo.accounts.adapter.SocialAccountAdapter'
+SOCIALACCOUNT_SIGNUP = False
+SOCIALACCOUNT_AUTO_SIGNUP = False
+
 LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'Europe/Berlin'

diff --git a/rdmo/core/static/core/css/base.scss b/rdmo/core/static/core/css/base.scss
@@ -316,3 +316,8 @@ li.has-warning > a.control-label > i {
 .select2-results__option--highlighted{
     background-color: $link-color !important,
 }
+
+.orcid-signin {
+    display: block;
+    margin-bottom: 10px;
+}