From afe55fce46c8e517ff7cc37693bed49689c2589a Mon Sep 17 00:00:00 2001 From: Johnson Chetty Date: Sat, 14 Jul 2012 05:10:48 +0200 Subject: [PATCH 1/2] All Auth setup + FB acc. config --- itf/settings.py | 35 ++++++++++++++++++++++++++++++++++- itf/urls.py | 4 +++- requirements.txt | 3 +++ wsgi/django.wsgi | 2 +- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/itf/settings.py b/itf/settings.py index 309daa4..ddd6b80 100755 --- a/itf/settings.py +++ b/itf/settings.py @@ -112,14 +112,23 @@ MEDIA_ROOT = join(PROJECT_PATH, 'static') TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.auth", + "django.contrib.auth.context_processors.auth", "django.core.context_processors.debug", "django.core.context_processors.i18n", "django.core.context_processors.media", "django.core.context_processors.request", + # "multilingual.context_processors.multilingual", - "frontpage.context_processors.menus" + "frontpage.context_processors.menus", + "allauth.account.context_processors.account", + "allauth.socialaccount.context_processors.socialaccount" ) +AUTHENTICATION_BACKENDS = ( + "allauth.account.auth_backends.AuthenticationBackend", ) + +AVATAR_STORAGE_DIR = 'uploads/avatars' + # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/" @@ -160,6 +169,7 @@ ROOT_URLCONF = 'urls' TEMPLATE_DIRS = ( join(PROJECT_PATH, 'templates'), + join(PROJECT_PATH, 'templates', 'allauth'), # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. @@ -204,8 +214,31 @@ INSTALLED_APPS = ( 'fccv', 'haystack', 'markitup', + 'emailconfirmation', +# 'avatar', + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'allauth.socialaccount.providers.twitter', + 'allauth.socialaccount.providers.linkedin', + 'allauth.socialaccount.providers.openid', + 'allauth.socialaccount.providers.facebook', + 'allauth.socialaccount.providers.github' ) + +LOGIN_REDIRECT_URL = '/' +ACCOUNT_EMAIL_REQUIRED = True + + +EMAIL_HOST ='smtp.gmail.com' +EMAIL_HOST_USER = 'subhodipbiswas@gmail.com' +EMAIL_HOST_PASSWORD ='doaxhentai' +EMAIL_PORT =587 +EMAIL_USE_TLS =True +SERVER_EMAIL = EMAIL_HOST_USER +DEFAULT_FROM_EMAIL=EMAIL_HOST_USER + ACCOUNT_ACTIVATION_DAYS = 30 #overwrite default settings with local settings diff --git a/itf/urls.py b/itf/urls.py index 1b310e7..8f64ba8 100755 --- a/itf/urls.py +++ b/itf/urls.py @@ -33,7 +33,9 @@ urlpatterns = patterns('', # (r'site.json', 'app.views.site_json'), (r'^itf/(?P.*)', 'festival.views.redirect'), # (r'^accounts/register/', 'registration.views.register', {'form_class': ItfRegistrationForm }), - (r'^accounts/', include('registration.urls')), + # registration accounts disabled for allauth + #(r'^accounts/', include('registration.urls')), + (r'^accounts/', include('allauth.urls')), (r'^admin/', include(admin.site.urls)), # ('^getLanguages', 'itfcore.views.getLanguages'), # Uncomment the admin/doc line below and add 'django.contrib.admindocs' diff --git a/requirements.txt b/requirements.txt index 81f164e..ea08579 100755 --- a/requirements.txt +++ b/requirements.txt @@ -20,3 +20,6 @@ django-crispy-forms django-floppyforms django-markitup twitter +-e git+git://github.com/pennersr/django-allauth.git#egg=django-allauth +-e git+git://github.com/pythonforfacebook/facebook-sdk.git#egg=facebook-sdk +django-avatar diff --git a/wsgi/django.wsgi b/wsgi/django.wsgi index 62d3c1b..6020375 100755 --- a/wsgi/django.wsgi +++ b/wsgi/django.wsgi @@ -16,7 +16,7 @@ sys.path.append(root_dir) sys.path.insert(0, os.path.join(root_dir, project_module)) #reload if this django.wsgi gets touched -from oxdjango import monitor +from ox.django import monitor monitor.start(interval=1.0) monitor.track(os.path.abspath(os.path.dirname(__file__))) From c8afa241d30fba91a9be1ee55f370594da117090 Mon Sep 17 00:00:00 2001 From: Johnson Chetty Date: Sat, 14 Jul 2012 05:11:57 +0200 Subject: [PATCH 2/2] All Auth templates --- itf/templates/allauth/account/base.html | 3 + itf/templates/allauth/account/email.html | 70 +++++++++++++++++++ itf/templates/allauth/account/login.html | 52 ++++++++++++++ itf/templates/allauth/account/logout.html | 11 +++ .../allauth/account/password_change.html | 14 ++++ .../allauth/account/password_delete.html | 14 ++++ .../allauth/account/password_delete_done.html | 10 +++ .../allauth/account/password_reset.html | 30 ++++++++ .../allauth/account/password_reset_done.html | 16 +++++ .../account/password_reset_from_key.html | 23 ++++++ .../account/password_reset_key_message.txt | 9 +++ .../allauth/account/password_set.html | 15 ++++ itf/templates/allauth/account/signup.html | 27 +++++++ .../account/snippets/already_logged_in.html | 5 ++ .../allauth/account/verification_sent.html | 12 ++++ .../emailconfirmation/confirm_email.html | 15 ++++ .../email_confirmation_message.txt | 4 ++ .../email_confirmation_subject.txt | 5 ++ itf/templates/allauth/openid/base.html | 1 + itf/templates/allauth/openid/login.html | 18 +++++ .../socialaccount/account_inactive.html | 11 +++ .../socialaccount/authentication_error.html | 11 +++ itf/templates/allauth/socialaccount/base.html | 2 + .../allauth/socialaccount/connections.html | 56 +++++++++++++++ .../socialaccount/login_cancelled.html | 16 +++++ .../allauth/socialaccount/signup.html | 25 +++++++ .../socialaccount/snippets/login_extra.html | 4 ++ .../socialaccount/snippets/provider_list.html | 19 +++++ 28 files changed, 498 insertions(+) create mode 100644 itf/templates/allauth/account/base.html create mode 100644 itf/templates/allauth/account/email.html create mode 100644 itf/templates/allauth/account/login.html create mode 100644 itf/templates/allauth/account/logout.html create mode 100644 itf/templates/allauth/account/password_change.html create mode 100644 itf/templates/allauth/account/password_delete.html create mode 100644 itf/templates/allauth/account/password_delete_done.html create mode 100644 itf/templates/allauth/account/password_reset.html create mode 100644 itf/templates/allauth/account/password_reset_done.html create mode 100644 itf/templates/allauth/account/password_reset_from_key.html create mode 100644 itf/templates/allauth/account/password_reset_key_message.txt create mode 100644 itf/templates/allauth/account/password_set.html create mode 100644 itf/templates/allauth/account/signup.html create mode 100644 itf/templates/allauth/account/snippets/already_logged_in.html create mode 100644 itf/templates/allauth/account/verification_sent.html create mode 100644 itf/templates/allauth/emailconfirmation/confirm_email.html create mode 100644 itf/templates/allauth/emailconfirmation/email_confirmation_message.txt create mode 100644 itf/templates/allauth/emailconfirmation/email_confirmation_subject.txt create mode 100644 itf/templates/allauth/openid/base.html create mode 100644 itf/templates/allauth/openid/login.html create mode 100644 itf/templates/allauth/socialaccount/account_inactive.html create mode 100644 itf/templates/allauth/socialaccount/authentication_error.html create mode 100644 itf/templates/allauth/socialaccount/base.html create mode 100644 itf/templates/allauth/socialaccount/connections.html create mode 100644 itf/templates/allauth/socialaccount/login_cancelled.html create mode 100644 itf/templates/allauth/socialaccount/signup.html create mode 100644 itf/templates/allauth/socialaccount/snippets/login_extra.html create mode 100644 itf/templates/allauth/socialaccount/snippets/provider_list.html diff --git a/itf/templates/allauth/account/base.html b/itf/templates/allauth/account/base.html new file mode 100644 index 0000000..1fd646d --- /dev/null +++ b/itf/templates/allauth/account/base.html @@ -0,0 +1,3 @@ +{% extends "noel/base.html" %} + + diff --git a/itf/templates/allauth/account/email.html b/itf/templates/allauth/account/email.html new file mode 100644 index 0000000..5163394 --- /dev/null +++ b/itf/templates/allauth/account/email.html @@ -0,0 +1,70 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account" %}{% endblock %} + +{% block content %} +

{% trans "E-mail Addresses" %}

+{% if user.emailaddress_set.all %} +

{% trans 'The following e-mail addresses are associated to your account:' %}

+ + + +{% else %} +

{% trans 'Warning:'%} {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}

+ +{% endif %} + + +

{% trans "Add E-mail Address" %}

+ +
+ {% csrf_token %} + {{ add_email_form.as_p}} + +
+ +{% endblock %} + + +{% block extra_body %} + +{% endblock %} diff --git a/itf/templates/allauth/account/login.html b/itf/templates/allauth/account/login.html new file mode 100644 index 0000000..35507ce --- /dev/null +++ b/itf/templates/allauth/account/login.html @@ -0,0 +1,52 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account_tags %} + +{% block head_title %}{% trans "Sign In" %}{% endblock %} + + +{% block content %} + +

{% trans "Sign In" %}

+ +{% if not user.is_authenticated %} + +{% if socialaccount.providers %} +

{% blocktrans with site.name as site_name %}Please sign in with one +of your existing third party accounts. Or, sign up for a {{site_name}} account and sign in +below:{% endblocktrans %}

+ +
+ +
    +{% include "socialaccount/snippets/provider_list.html" %} +
+ + + +
+ +{% include "socialaccount/snippets/login_extra.html" %} + +{% endif %} +{% endif %} + + + +{% if user.is_authenticated %} +{% include "account/snippets/already_logged_in.html" %} +{% endif %} + + +{% endblock %} + diff --git a/itf/templates/allauth/account/logout.html b/itf/templates/allauth/account/logout.html new file mode 100644 index 0000000..b280b5b --- /dev/null +++ b/itf/templates/allauth/account/logout.html @@ -0,0 +1,11 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Signed Out" %}{% endblock %} + +{% block content %} +

{% trans "Signed Out" %}

+ +

{% trans "You have signed out." %}

+{% endblock %} diff --git a/itf/templates/allauth/account/password_change.html b/itf/templates/allauth/account/password_change.html new file mode 100644 index 0000000..2762a41 --- /dev/null +++ b/itf/templates/allauth/account/password_change.html @@ -0,0 +1,14 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% block head_title %}{% trans "Change Password" %}{% endblock %} + +{% block content %} +

{% trans "Change Password" %}

+ +
+ {% csrf_token %} + {{ password_change_form.as_p }} + +
+{% endblock %} diff --git a/itf/templates/allauth/account/password_delete.html b/itf/templates/allauth/account/password_delete.html new file mode 100644 index 0000000..b159f36 --- /dev/null +++ b/itf/templates/allauth/account/password_delete.html @@ -0,0 +1,14 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Delete Password" %}{% endblock %} + +{% block content %} +

{% trans "Delete Password" %}

+

{% blocktrans %}You may delete your password since you are currently logged in using OpenID.{% endblocktrans %}

+
+ {% csrf_token %} + +
+{% endblock %} diff --git a/itf/templates/allauth/account/password_delete_done.html b/itf/templates/allauth/account/password_delete_done.html new file mode 100644 index 0000000..3cb7ef5 --- /dev/null +++ b/itf/templates/allauth/account/password_delete_done.html @@ -0,0 +1,10 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Password Deleted" %}{% endblock %} + +{% block content %} +

{% trans "Password Deleted" %}

+

{% blocktrans %}Your password has been deleted.{% endblocktrans %}

+{% endblock %} diff --git a/itf/templates/allauth/account/password_reset.html b/itf/templates/allauth/account/password_reset.html new file mode 100644 index 0000000..dfa3ee0 --- /dev/null +++ b/itf/templates/allauth/account/password_reset.html @@ -0,0 +1,30 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account_tags %} + +{% block head_title %}{% trans "Password Reset" %}{% endblock %} + +{% block content %} + +

{% trans "Password Reset" %}

+ {% if user.is_authenticated %} + {% include "account/snippets/already_logged_in.html" %} + {% endif %} + +

{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}

+ +
+ {% csrf_token %} + {{ password_reset_form.as_p }} + +
+ +

{% blocktrans %}If you have any trouble resetting your password, contact us at {{ CONTACT_EMAIL }}.{% endblocktrans %}

+{% endblock %} + +{% block extra_body %} + +{% endblock %} diff --git a/itf/templates/allauth/account/password_reset_done.html b/itf/templates/allauth/account/password_reset_done.html new file mode 100644 index 0000000..e6294c0 --- /dev/null +++ b/itf/templates/allauth/account/password_reset_done.html @@ -0,0 +1,16 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account_tags %} + +{% block head_title %}{% trans "Password Reset" %}{% endblock %} + +{% block content %} +

{% trans "Password Reset" %}

+ + {% if user.is_authenticated %} + {% include "account/snippets/already_logged_in.html" %} + {% endif %} + +

{% blocktrans %}We have sent you an e-mail. If you do not receive it within a few minutes, contact us at {{ CONTACT_EMAIL }}.{% endblocktrans %}

+{% endblock %} diff --git a/itf/templates/allauth/account/password_reset_from_key.html b/itf/templates/allauth/account/password_reset_from_key.html new file mode 100644 index 0000000..510af82 --- /dev/null +++ b/itf/templates/allauth/account/password_reset_from_key.html @@ -0,0 +1,23 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% block head_title %}{% trans "Change Password" %}{% endblock %} + +{% block content %} +

{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}

+ + {% if token_fail %} + {% url account_reset_password as passwd_reset_url %} +

{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new password reset.{% endblocktrans %}

+ {% else %} + {% if form %} +
+ {% csrf_token %} + {{ form.as_p }} + +
+ {% else %} +

{% trans 'Your password is now changed.' %}

+ {% endif %} + {% endif %} +{% endblock %} diff --git a/itf/templates/allauth/account/password_reset_key_message.txt b/itf/templates/allauth/account/password_reset_key_message.txt new file mode 100644 index 0000000..585e8b3 --- /dev/null +++ b/itf/templates/allauth/account/password_reset_key_message.txt @@ -0,0 +1,9 @@ +{% load i18n %}{% blocktrans with site.domain as site_domain and user.username as username %}You're receiving this e-mail because you or someone else has requested a password for your user account at {{site_domain}}. +It can be safely ignored if you did not request a password reset. Click the link below to reset your password. + +{{password_reset_url}} + +In case you forgot, your username is {{username}}. + +Thanks for using our site! +{% endblocktrans %} diff --git a/itf/templates/allauth/account/password_set.html b/itf/templates/allauth/account/password_set.html new file mode 100644 index 0000000..42981ea --- /dev/null +++ b/itf/templates/allauth/account/password_set.html @@ -0,0 +1,15 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Set Password" %}{% endblock %} + +{% block content %} +

{% trans "Set Password" %}

+ +
+ {% csrf_token %} + {{ password_set_form.as_p }} + +
+{% endblock %} diff --git a/itf/templates/allauth/account/signup.html b/itf/templates/allauth/account/signup.html new file mode 100644 index 0000000..0d77f60 --- /dev/null +++ b/itf/templates/allauth/account/signup.html @@ -0,0 +1,27 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Signup" %}{% endblock %} + +{% block content %} +

{% trans "Sign Up" %}

+ + {% if user.is_authenticated %} +{% include "account/snippets/already_logged_in.html" %} + {% else %} +

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

+ + + + {% endif %} +{% endblock %} + + diff --git a/itf/templates/allauth/account/snippets/already_logged_in.html b/itf/templates/allauth/account/snippets/already_logged_in.html new file mode 100644 index 0000000..13ee8b6 --- /dev/null +++ b/itf/templates/allauth/account/snippets/already_logged_in.html @@ -0,0 +1,5 @@ +{% load i18n %} +{% load account_tags %} + +{% user_display user as user_display %} +

{% trans "Note" %}: {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}

diff --git a/itf/templates/allauth/account/verification_sent.html b/itf/templates/allauth/account/verification_sent.html new file mode 100644 index 0000000..dbed4fc --- /dev/null +++ b/itf/templates/allauth/account/verification_sent.html @@ -0,0 +1,12 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} + +{% block content %} +

{% trans "Verify Your E-mail Address" %}

+ +

{% blocktrans %}We have sent you an e-mail to {{ email }} for verification. Follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at {{ CONTACT_EMAIL }}.{% endblocktrans %}

+ +{% endblock %} diff --git a/itf/templates/allauth/emailconfirmation/confirm_email.html b/itf/templates/allauth/emailconfirmation/confirm_email.html new file mode 100644 index 0000000..a540df4 --- /dev/null +++ b/itf/templates/allauth/emailconfirmation/confirm_email.html @@ -0,0 +1,15 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "E-mail Address Confirmation" %}{% endblock %} + +{% block content %} +

{% trans "E-mail Address Confirmation" %}

+ {% if email_address %} + +

{% blocktrans with email_address.email as email and email_address.user as user %}You have confirmed that {{ email }} is an e-mail address for user '{{ user }}'.{% endblocktrans %}

+ {% else %} +

{% trans "Invalid confirmation key." %}

+ {% endif %} +{% endblock %} diff --git a/itf/templates/allauth/emailconfirmation/email_confirmation_message.txt b/itf/templates/allauth/emailconfirmation/email_confirmation_message.txt new file mode 100644 index 0000000..d3e723e --- /dev/null +++ b/itf/templates/allauth/emailconfirmation/email_confirmation_message.txt @@ -0,0 +1,4 @@ +{% load i18n %}{% autoescape off %}{% blocktrans with current_site.name as site_name %}User '{{ user }}' at {{ site_name }} has given this as an email address. + +To confirm this is correct, go to {{ activate_url }} +{% endblocktrans %}{% endautoescape %} diff --git a/itf/templates/allauth/emailconfirmation/email_confirmation_subject.txt b/itf/templates/allauth/emailconfirmation/email_confirmation_subject.txt new file mode 100644 index 0000000..0333a85 --- /dev/null +++ b/itf/templates/allauth/emailconfirmation/email_confirmation_subject.txt @@ -0,0 +1,5 @@ +{% load i18n %}{% autoescape off %}[{{current_site.name}}] {% blocktrans %}Confirm E-mail Address{% endblocktrans %}{% endautoescape %}{% comment %} +Local Variables: +require-final-newline: nil; +End: +{% endcomment %} \ No newline at end of file diff --git a/itf/templates/allauth/openid/base.html b/itf/templates/allauth/openid/base.html new file mode 100644 index 0000000..671d403 --- /dev/null +++ b/itf/templates/allauth/openid/base.html @@ -0,0 +1 @@ +{% extends "socialaccount/base.html" %} diff --git a/itf/templates/allauth/openid/login.html b/itf/templates/allauth/openid/login.html new file mode 100644 index 0000000..4c6b40f --- /dev/null +++ b/itf/templates/allauth/openid/login.html @@ -0,0 +1,18 @@ +{% extends "openid/base.html" %} + +{% load i18n %} + +{% block head_title %}OpenID Sign In{% endblock %} + +{% block content %} + +

{% trans 'OpenID Sign In' %}

+ + + + +{% endblock %} diff --git a/itf/templates/allauth/socialaccount/account_inactive.html b/itf/templates/allauth/socialaccount/account_inactive.html new file mode 100644 index 0000000..8c56ceb --- /dev/null +++ b/itf/templates/allauth/socialaccount/account_inactive.html @@ -0,0 +1,11 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Inactive" %}{% endblock %} + +{% block content %} +

{% trans "Account Inactive" %}

+ +

{% trans "This account is inactive." %}

+{% endblock %} diff --git a/itf/templates/allauth/socialaccount/authentication_error.html b/itf/templates/allauth/socialaccount/authentication_error.html new file mode 100644 index 0000000..e6274cb --- /dev/null +++ b/itf/templates/allauth/socialaccount/authentication_error.html @@ -0,0 +1,11 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %} + +{% block content %} +

{% trans "Social Network Login Failure" %}

+ +

{% trans "An error occured while attempting to login via your social network account." %}

+{% endblock %} diff --git a/itf/templates/allauth/socialaccount/base.html b/itf/templates/allauth/socialaccount/base.html new file mode 100644 index 0000000..18530d1 --- /dev/null +++ b/itf/templates/allauth/socialaccount/base.html @@ -0,0 +1,2 @@ +{% extends "account/base.html" %} + diff --git a/itf/templates/allauth/socialaccount/connections.html b/itf/templates/allauth/socialaccount/connections.html new file mode 100644 index 0000000..c48c2f6 --- /dev/null +++ b/itf/templates/allauth/socialaccount/connections.html @@ -0,0 +1,56 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Connections" %}{% endblock %} + +{% block content %} +

{% trans "Account Connections" %}

+ +{% if form.accounts %} +

{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}

+ + +
+{% csrf_token %} + +
+{% if form.non_field_errors %} +
{{form.non_field_errors}}
+{% endif %} + +{% for base_account in form.accounts %} +{% with base_account.get_provider_account as account %} +
+ +
+{% endwith %} +{% endfor %} + +
+ +
+ +
+ +
+ +{% else %} +

You currently have no social network accounts connected to this account.

+{% endif %} + +

{% trans 'Add a 3rd Party Account' %}

+ +
    +{% include "socialaccount/snippets/provider_list.html" %} +
+ +{% include "socialaccount/snippets/login_extra.html" %} + +{% endblock %} + + diff --git a/itf/templates/allauth/socialaccount/login_cancelled.html b/itf/templates/allauth/socialaccount/login_cancelled.html new file mode 100644 index 0000000..480b923 --- /dev/null +++ b/itf/templates/allauth/socialaccount/login_cancelled.html @@ -0,0 +1,16 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Login Cancelled" %}{% endblock %} + +{% block content %} + +

{% trans "Login Cancelled" %}

+ +{% url socialaccount_login as login_url %} + +

{% blocktrans %}You decided to cancel logging in to our site using one of your exisiting accounts. If this was a mistake, please proceed to sign in.{% endblocktrans %}

+ +{% endblock %} + diff --git a/itf/templates/allauth/socialaccount/signup.html b/itf/templates/allauth/socialaccount/signup.html new file mode 100644 index 0000000..a385064 --- /dev/null +++ b/itf/templates/allauth/socialaccount/signup.html @@ -0,0 +1,25 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Signup" %}{% endblock %} + +{% block content %} +

{% trans "Sign Up" %}

+ +

{% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to +{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}

+ + + + +{% endblock %} + + diff --git a/itf/templates/allauth/socialaccount/snippets/login_extra.html b/itf/templates/allauth/socialaccount/snippets/login_extra.html new file mode 100644 index 0000000..67e1452 --- /dev/null +++ b/itf/templates/allauth/socialaccount/snippets/login_extra.html @@ -0,0 +1,4 @@ +{% load socialaccount_tags %} + +{% providers_media_js %} + diff --git a/itf/templates/allauth/socialaccount/snippets/provider_list.html b/itf/templates/allauth/socialaccount/snippets/provider_list.html new file mode 100644 index 0000000..8661e8f --- /dev/null +++ b/itf/templates/allauth/socialaccount/snippets/provider_list.html @@ -0,0 +1,19 @@ +{% load socialaccount_tags %} + +{% for provider in socialaccount.providers %} +{% if provider.id == "openid" %} +{% for brand in provider.get_brands %} +
  • + {{brand.name}} +
  • +{% endfor %} +{% endif %} +
  • + {{provider.name}} +
  • +{% endfor %} +