From b693320f8d9fb0f452eb3ce012ebafb58d07f093 Mon Sep 17 00:00:00 2001 From: Karen Date: Thu, 19 Jul 2012 15:48:30 +0530 Subject: [PATCH] modal_content blocks for allauth social templates --- .../socialaccount/account_inactive.html | 22 ++-- .../socialaccount/authentication_error.html | 22 ++-- .../allauth/socialaccount/connections.html | 112 +++++++++--------- .../socialaccount/login_cancelled.html | 32 ++--- .../allauth/socialaccount/signup.html | 50 ++++---- 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/itf/templates/allauth/socialaccount/account_inactive.html b/itf/templates/allauth/socialaccount/account_inactive.html index 8c56ceb..5afea14 100644 --- a/itf/templates/allauth/socialaccount/account_inactive.html +++ b/itf/templates/allauth/socialaccount/account_inactive.html @@ -1,11 +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 %} +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Inactive" %}{% endblock %} + +{% block modal_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 index e6274cb..669d596 100644 --- a/itf/templates/allauth/socialaccount/authentication_error.html +++ b/itf/templates/allauth/socialaccount/authentication_error.html @@ -1,11 +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 %} +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %} + +{% block modal_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/connections.html b/itf/templates/allauth/socialaccount/connections.html index c48c2f6..51d3601 100644 --- a/itf/templates/allauth/socialaccount/connections.html +++ b/itf/templates/allauth/socialaccount/connections.html @@ -1,56 +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/login_extra.html" %} - -{% endblock %} - - +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Connections" %}{% endblock %} + +{% block modal_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/login_extra.html" %} + +{% endblock %} + + diff --git a/itf/templates/allauth/socialaccount/login_cancelled.html b/itf/templates/allauth/socialaccount/login_cancelled.html index 480b923..d2d67c4 100644 --- a/itf/templates/allauth/socialaccount/login_cancelled.html +++ b/itf/templates/allauth/socialaccount/login_cancelled.html @@ -1,16 +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 %} - +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Login Cancelled" %}{% endblock %} + +{% block modal_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 index a385064..5a971ef 100644 --- a/itf/templates/allauth/socialaccount/signup.html +++ b/itf/templates/allauth/socialaccount/signup.html @@ -1,25 +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 %}

- -
- {% csrf_token %} - {{ form.as_p }} - {% if redirect_field_value %} - - {% endif %} - -
- - -{% endblock %} - - +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Signup" %}{% endblock %} + +{% block modal_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 %}

+ +
+ {% csrf_token %} + {{ form.as_p }} + {% if redirect_field_value %} + + {% endif %} + +
+ + +{% endblock %} + +