From a6db1ef5159ff618a9d1a78ff14fd705a106c130 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 12 Mar 2012 13:43:40 +0100 Subject: [PATCH 1/1] nicer social auth --- apps/ajaxable/templatetags/__init__.py | 0 apps/ajaxable/templatetags/ajaxable_tags.py | 7 +++++ requirements.txt | 1 + wolnelektury/static/img/auth/facebook.png | Bin 0 -> 1105 bytes wolnelektury/static/img/auth/google-icon.png | Bin 15517 -> 0 bytes .../img/auth/openid-large.png?1237615666 | Bin 4871 -> 0 bytes wolnelektury/static/img/auth/twitter.png | Bin 0 -> 1188 bytes wolnelektury/static/js/dialogs.js | 2 +- wolnelektury/templates/auth/login.html | 19 ++++++++------ .../templates/auth/login_register.html | 9 ++----- wolnelektury/templates/openid/login.html | 24 ++++++++++++++++++ .../templates/socialaccount/base.html | 1 + .../socialaccount/snippets/provider_list.html | 21 ++++++++++----- 13 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 apps/ajaxable/templatetags/__init__.py create mode 100644 apps/ajaxable/templatetags/ajaxable_tags.py create mode 100644 wolnelektury/static/img/auth/facebook.png delete mode 100644 wolnelektury/static/img/auth/google-icon.png delete mode 100644 wolnelektury/static/img/auth/openid-large.png?1237615666 create mode 100644 wolnelektury/static/img/auth/twitter.png create mode 100644 wolnelektury/templates/openid/login.html create mode 100644 wolnelektury/templates/socialaccount/base.html 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 0000000000000000000000000000000000000000..f9b6e71494072be50b14bc734788450d03efd708 GIT binary patch literal 1105 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 diff --git a/wolnelektury/static/img/auth/twitter.png b/wolnelektury/static/img/auth/twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a55029d0e9583c9a6026a02a5cb3d81890e895 GIT binary patch literal 1188 zcmV;V1Y7%wP)K~z}7?U&DMTvZguKj+>% zZ!$ldOiW@DQ^ZmW_#dopvUZNhUM%-n}l~n>3So^JWyG3OTzO=HAaezrN>;-0`jBT9~>f)P3+i zcpu#V7C{RFT82Gh{*|}a0|JL9Y+H(kVdw+ET5t~A{|5qFmIp_FBUl$X^x-@= zXR!_?k(UBz%DnaqULsk~JoiR?4uqOdxy{2RX44!SD)f+@#r{t zP0-z7X5jgzr5@m^y#lNN0Ubl$4Y#1gqP;}N?YF;^4=dbE!ja-`n8i58UX=3RN|>Aj^>heSaefwW^{L9a%BKPWN%_+AW3auXJt}lVPtu6$z?nM0000* ' + gettext("Loading") + '

', 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 %} +

{{ title }}

-{% block extra %} +
+
    +
    + {{ form.as_ul }} +
  1. {% trans "Forgot your password?" %}
    2. +
    3. +
+
-

{% trans "or join accounts:" %}

+

{% trans "or merge accounts:" %}

-
    {% include "socialaccount/snippets/provider_list.html" %} -
- -{% 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 %} -

{% trans "or join accounts:" %}

- -
    -{% include "socialaccount/snippets/provider_list.html" %} -
- +{{ block.super }}

{% trans "or register" %}:

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 %} + +

{% trans 'OpenID Sign In' %}

+ + +
+
    + {% csrf_token %} + {% with form|placeholdize as f %} + {{ f.as_ul }} + {% endwith %} +
    • +
+
+ +{% 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 %} + +
    {% if allauth.openid_enabled %}
  • Google
    • {% endif %} +{% if allauth.facebook_enabled %} +
    • +{% endif %} {% if allauth.twitter_enabled %}
    • {% endif %} -{% if allauth.facebook_enabled %} -
    • -{% endif %} {% if allauth.openid_enabled %} + - +
  • + OpenID
    • {% endif %} +
-- 2.20.1