From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 12 Mar 2012 12:43:40 +0000 (+0100)
Subject: nicer social auth
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/a6db1ef5159ff618a9d1a78ff14fd705a106c130?ds=inline;hp=5c13a97ebf1e00928ae582737cd66fdcab2cfcec

nicer social auth
---

diff --git a/apps/ajaxable/templatetags/__init__.py b/apps/ajaxable/templatetags/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/ajaxable/templatetags/ajaxable_tags.py b/apps/ajaxable/templatetags/ajaxable_tags.py
new file mode 100644
index 000000000..2f9a8c4c8
--- /dev/null
+++ b/apps/ajaxable/templatetags/ajaxable_tags.py
@@ -0,0 +1,7 @@
+from django import template
+from ajaxable.utils import placeholdized
+register = template.Library()
+
+@register.filter
+def placeholdize(form):
+    return placeholdized(form)
diff --git a/requirements.txt b/requirements.txt
index ecb07cca2..bf8bb438a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ django-allauth
 
 python-memcached
 piwik
+python-fb
 
 # Feedparser 
 Feedparser>=4.1
diff --git a/wolnelektury/static/img/auth/facebook.png b/wolnelektury/static/img/auth/facebook.png
new file mode 100644
index 000000000..f9b6e7149
Binary files /dev/null and b/wolnelektury/static/img/auth/facebook.png differ
diff --git a/wolnelektury/static/img/auth/google-icon.png b/wolnelektury/static/img/auth/google-icon.png
deleted file mode 100644
index d16d5313e..000000000
Binary files a/wolnelektury/static/img/auth/google-icon.png and /dev/null differ
diff --git a/wolnelektury/static/img/auth/openid-large.png?1237615666 b/wolnelektury/static/img/auth/openid-large.png?1237615666
deleted file mode 100644
index 6094fffec..000000000
Binary files a/wolnelektury/static/img/auth/openid-large.png?1237615666 and /dev/null differ
diff --git a/wolnelektury/static/img/auth/twitter.png b/wolnelektury/static/img/auth/twitter.png
new file mode 100644
index 000000000..d2a55029d
Binary files /dev/null and b/wolnelektury/static/img/auth/twitter.png differ
diff --git a/wolnelektury/static/js/dialogs.js b/wolnelektury/static/js/dialogs.js
index 086a47d3d..9b8750d0c 100755
--- a/wolnelektury/static/js/dialogs.js
+++ b/wolnelektury/static/js/dialogs.js
@@ -58,7 +58,7 @@
             $('body').append($window);
 
             $window.jqm({
-                ajax: '/uzytkownicy/zaloguj-utworz/',
+                ajax: '/uzytkownicy/zaloguj-utworz/?next=' + escape(window.location),
                 ajaxText: '<p><img src="' + STATIC_URL + 'img/indicator.gif" alt="*"/> ' + gettext("Loading") + '</p>',
                 target: $('.target', $window)[0],
                 overlay: 60,
diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html
index 553e873a0..ba5385a13 100644
--- a/wolnelektury/templates/auth/login.html
+++ b/wolnelektury/templates/auth/login.html
@@ -1,14 +1,17 @@
-{% extends "ajaxable/form.html" %}
 {% load i18n %}
+<h1>{{ title }}</h1>
 
-{% block extra %}
+<form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
+	class="cuteform{% if placeholdize %} hidelabels{% endif %}">
+<ol>
+    <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
+    {{ form.as_ul }}
+    <li><a href="{% url account_reset_password %}">{% trans "Forgot your password?" %}</a></li>
+    <li><input type="submit" value="{{ submit }}"/></li>
+</ol>
+</form>
 
-<h2>{% trans "or join accounts:" %}</h2>
+<h1>{% trans "or merge accounts:" %}</h1>
 
-<ul class="socialauth">
 {% include "socialaccount/snippets/provider_list.html" %}
-</ul>
-
-{% endblock %}
-
 
diff --git a/wolnelektury/templates/auth/login_register.html b/wolnelektury/templates/auth/login_register.html
index 394902a2b..f879d4674 100755
--- a/wolnelektury/templates/auth/login_register.html
+++ b/wolnelektury/templates/auth/login_register.html
@@ -1,14 +1,9 @@
-{% extends "ajaxable/form.html" %}
+{% extends "auth/login.html" %}
 {% load i18n %}
 
 {% block extra %}
 
-<h2>{% trans "or join accounts:" %}</h2>
-
-<ul class="socialauth">
-{% include "socialaccount/snippets/provider_list.html" %}
-</ul>
-
+{{ block.super }}
 
 <h1>{% trans "or register" %}:</h1>
 
diff --git a/wolnelektury/templates/openid/login.html b/wolnelektury/templates/openid/login.html
new file mode 100644
index 000000000..afe7fe8f4
--- /dev/null
+++ b/wolnelektury/templates/openid/login.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load ajaxable_tags %}
+
+
+{% block titleextra %}{% trans "OpenID Sign In" %}{% endblock %}
+
+
+{% block body %}
+
+<h1>{% trans 'OpenID Sign In' %}</h1>
+
+
+<form class="cuteform hidelabels" method="post" action="{% url openid_login %}">
+<ul>
+	{% csrf_token %}
+	{% with form|placeholdize as f %}
+    	{{ f.as_ul }}
+    {% endwith %}
+    <li><input type="submit" value='{% trans "Login" %}' /></li>
+</ul>
+</form>
+
+{% endblock %}
diff --git a/wolnelektury/templates/socialaccount/base.html b/wolnelektury/templates/socialaccount/base.html
new file mode 100644
index 000000000..94d9808cc
--- /dev/null
+++ b/wolnelektury/templates/socialaccount/base.html
@@ -0,0 +1 @@
+{% extends "base.html" %}
diff --git a/wolnelektury/templates/socialaccount/snippets/provider_list.html b/wolnelektury/templates/socialaccount/snippets/provider_list.html
index 99e30a5c1..45b740c25 100644
--- a/wolnelektury/templates/socialaccount/snippets/provider_list.html
+++ b/wolnelektury/templates/socialaccount/snippets/provider_list.html
@@ -1,21 +1,30 @@
 {% load allauth_tags %}
+{% load catalogue_tags %}
 
+{% if allauth.facebook_enabled %}
+{% fbconnect %}
+{% endif %}
+
+<ul class="socialauth">
 {% if allauth.openid_enabled %}
 <li><a title="Google" class="socialaccount_provider google" href="{% openid_login_url openid="https://www.google.com/accounts/o8/id" %}">
 	<img alt="Google" src="{{ STATIC_URL }}img/auth/google.png" /></a></li>
 {% endif %}
+{% if allauth.facebook_enabled %}
+<li><a title="Facebook" class="socialaccount_provider facebook" href="{% facebook_login_url next=request.GET.next|build_absolute_uri:request %}">
+	<img alt="Facebook" src="{{ STATIC_URL }}img/auth/facebook.png" /></a></li>
+{% endif %}
 {% if allauth.twitter_enabled %}
 <li><a title="Twitter" class="socialaccount_provider twitter" href="{% twitter_login_url %}">
 	<img alt="Twitter" src="{{ STATIC_URL }}img/auth/twitter.png" /></a></li>
 {% endif %}
-{% if allauth.facebook_enabled %}
-<li><a title="Facebook" class="socialaccount_provider facebook" href="{% facebook_login_url %}">
-	<img alt="Facebook" src="{{ STATIC_URL }}img/auth/facebook.png" /></a></li>
-{% endif %}
 {% if allauth.openid_enabled %}
+<!--li><a title="WP.pl" class="socialaccount_provider wppl" href="{% openid_login_url openid="http://openid.wp.pl" %}">
+	<img alt="WP.pl" src="{{ STATIC_URL }}img/auth/wppl.png" /></a></li-->
 <!--li><a title="Yahoo" class="socialaccount_provider yahoo" href="{% openid_login_url openid="http://me.yahoo.com" %}">
 	<img alt="Yahoo" src="{{ STATIC_URL }}img/auth/yahoo.png" /></a></li-->
-<!--li><a title="OpenID" class="socialaccount_provider openid" href="{% openid_login_url %}">
-	<img alt="OpenID" src="{{ STATIC_URL }}img/auth/openid.png" /></a></li-->
+<li><a title="OpenID" class="socialaccount_provider openid" href="{% openid_login_url %}">
+	<img alt="OpenID" src="{{ STATIC_URL }}img/auth/openid.png" /></a></li>
 <!--li><a title="Hyves" class="socialaccount_provider hyves" href="{% openid_login_url openid="http://hyves.nl" %}">Hyves</a></li-->
 {% endif %}
+</ul>