{% 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>