From d7f7901e73d0924da239c5f78ad3ca3f2e498f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Ba=CC=88chler?= <sb@feinheit.ch>
Date: Mon, 7 May 2012 15:16:29 +0200
Subject: [PATCH] update social auth logins

---
 feincmsorg/settings.py                       | 9 +++++----
 feincmsorg/templates/registration/login.html | 8 +++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/feincmsorg/settings.py b/feincmsorg/settings.py
index f57f9bf..9261df3 100644
--- a/feincmsorg/settings.py
+++ b/feincmsorg/settings.py
@@ -59,6 +59,7 @@
     'django.core.context_processors.static',
     'feincms.context_processors.add_page_if_missing',
     'feincmsorg.context_processors.meta_navigation',
+    'social_auth.context_processors.social_auth_backends',
 )
 
 ROOT_URLCONF = APP_MODULE+'.urls'
@@ -71,8 +72,6 @@
     'social_auth.backends.twitter.TwitterBackend',
     'social_auth.backends.facebook.FacebookBackend',
     'social_auth.backends.contrib.github.GithubBackend',
-    'social_auth.backends.OpenIDBackend',
-    'social_auth.backends.contrib.bitbucket.BitbucketBackend',
     'django.contrib.auth.backends.ModelBackend',
 )
 
@@ -124,10 +123,12 @@
 GRID = {'column': 30, 'spacing': 10, 'vertical': 18}
 
 ACCOUNT_ACTIVATION_DAYS = 7
-LOGIN_URL          = '/login/'
+LOGIN_URL          = 'accounts/login/'
 LOGIN_REDIRECT_URL = '/'
-SOCIAL_AUTH_LOGIN_REDIRECT_URL = 'http://feincms.org/'
+
+
 SOCIAL_AUTH_DEFAULT_USERNAME = 'new_social_auth_user'
+FACEBOOK_EXTENDED_PERMISSIONS = ['email']
 
 #PINGING_WEBLOG_NAME = 'Mein grossartiger Blog!'
 #PINGING_WEBLOG_URL = 'http://www.feinheit.ch/blog'
diff --git a/feincmsorg/templates/registration/login.html b/feincmsorg/templates/registration/login.html
index 516306e..4005bbf 100644
--- a/feincmsorg/templates/registration/login.html
+++ b/feincmsorg/templates/registration/login.html
@@ -16,4 +16,10 @@ <h2>Log in</h2>
     <p class="submit"><button type="submit" name="submit" value="Login">Log in</button></p>
     {% if next %}<input type="hidden" name="next" value="{{ next }}">{% endif %}
   </form>
-{% endblock %}
\ No newline at end of file
+<div class="social-auth">
+    {% for name in social_auth.backends %}
+    <li><a rel="nofollow" href="{% url socialauth_begin name %}">{{ name|title }}</a></li>
+    {% endfor %}
+</div>
+
+{% endblock %}