link to signup
This commit is contained in:
commit
4e786a13a1
|
@ -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
|
||||
|
|
|
@ -72,27 +72,34 @@ function dismissAddAnotherPopup(win, newId, newRepr) {
|
|||
newId = html_unescape(newId);
|
||||
newRepr = html_unescape(newRepr);
|
||||
var name = windowname_to_id(win.name);
|
||||
alert(name);
|
||||
var elem = document.getElementById(name);
|
||||
//alert(name);
|
||||
var elem = $('#id_' + name);
|
||||
//console.log(elem);
|
||||
if (elem) {
|
||||
if (elem.nodeName == 'SELECT') {
|
||||
var o = new Option(newRepr, newId);
|
||||
elem.options[elem.options.length] = o;
|
||||
o.selected = true;
|
||||
} else if (elem.nodeName == 'INPUT') {
|
||||
if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
|
||||
elem.value += ',' + newId;
|
||||
} else {
|
||||
elem.value = newId;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
var toId = name + "_to";
|
||||
elem = document.getElementById(toId);
|
||||
var o = new Option(newRepr, newId);
|
||||
SelectBox.add_to_cache(toId, o);
|
||||
SelectBox.redisplay(toId);
|
||||
}
|
||||
//alert(newRepr);
|
||||
//alert(newId);
|
||||
elem.select2("val", {'id': newId, 'text': newRepr});
|
||||
//var elem = document.getElementById(name);
|
||||
|
||||
//console.log(elem);
|
||||
|
||||
// if (elem) {
|
||||
// if (elem.nodeName == 'SELECT') {
|
||||
// var o = new Option(newRepr, newId);
|
||||
// elem.options[elem.options.length] = o;
|
||||
// o.selected = true;
|
||||
// } else if (elem.nodeName == 'INPUT') {
|
||||
// if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
|
||||
// elem.value += ',' + newId;
|
||||
// } else {
|
||||
// elem.value = newId;
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
// var toId = name + "_to";
|
||||
// elem = document.getElementById(toId);
|
||||
// var o = new Option(newRepr, newId);
|
||||
// SelectBox.add_to_cache(toId, o);
|
||||
// SelectBox.redisplay(toId);
|
||||
// }
|
||||
win.close();
|
||||
}
|
||||
|
|
3
itf/templates/allauth/account/base.html
Normal file
3
itf/templates/allauth/account/base.html
Normal file
|
@ -0,0 +1,3 @@
|
|||
{% extends "noel/base.html" %}
|
||||
|
||||
|
70
itf/templates/allauth/account/email.html
Normal file
70
itf/templates/allauth/account/email.html
Normal file
|
@ -0,0 +1,70 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Account" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "E-mail Addresses" %}</h1>
|
||||
{% if user.emailaddress_set.all %}
|
||||
<p>{% trans 'The following e-mail addresses are associated to your account:' %}</p>
|
||||
|
||||
<form action="{% url account_email %}" class="email_list" method="post">
|
||||
{% csrf_token %}
|
||||
<fieldset class="blockLabels">
|
||||
|
||||
{% for emailaddress in user.emailaddress_set.all %}
|
||||
<div class="ctrlHolder">
|
||||
<label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
|
||||
|
||||
<input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
|
||||
|
||||
{{ emailaddress.email }}
|
||||
{% if emailaddress.verified %}
|
||||
<span class="verified">{% trans "Verified" %}</span>
|
||||
{% else %}
|
||||
<span class="unverified">{% trans "Unverified" %}</span>
|
||||
{% endif %}
|
||||
{% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
|
||||
</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="buttonHolder">
|
||||
<button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
|
||||
<button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
|
||||
<button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
{% else %}
|
||||
<p><strong>{% trans 'Warning:'%}</strong> {% 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." %}</p>
|
||||
|
||||
{% endif %}
|
||||
|
||||
|
||||
<h2>{% trans "Add E-mail Address" %}</h2>
|
||||
|
||||
<form method="post" action="" class="add_email uniForm">
|
||||
{% csrf_token %}
|
||||
{{ add_email_form.as_p}}
|
||||
<button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block extra_body %}
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
$("button[name='action_remove']").click(function(){
|
||||
if (confirm("{% trans 'Do you really want to remove the selected e-mail address?' %}")) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
52
itf/templates/allauth/account/login.html
Normal file
52
itf/templates/allauth/account/login.html
Normal file
|
@ -0,0 +1,52 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Sign In" %}{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans "Sign In" %}</h1>
|
||||
|
||||
{% if not user.is_authenticated %}
|
||||
|
||||
{% if socialaccount.providers %}
|
||||
<p>{% blocktrans with site.name as site_name %}Please sign in with one
|
||||
of your existing third party accounts. Or, <a
|
||||
href="{{ signup_url }}">sign up</a> for a {{site_name}} account and sign in
|
||||
below:{% endblocktrans %}</p>
|
||||
|
||||
<div class="socialaccount_ballot">
|
||||
|
||||
<ul class="socialaccount_providers">
|
||||
{% include "socialaccount/snippets/provider_list.html" %}
|
||||
</ul>
|
||||
|
||||
<div class="login-or">{% trans 'or' %}</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% include "socialaccount/snippets/login_extra.html" %}
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<form class="login" method="POST" action="{% url account_login %}">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
||||
{% endif %}
|
||||
<a class="button secondaryAction" href="{% url account_reset_password %}">{% trans "Forgot Password?" %}</a>
|
||||
<button class="primaryAction" type="submit">{% trans "Sign In" %}</button>
|
||||
</form>
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
11
itf/templates/allauth/account/logout.html
Normal file
11
itf/templates/allauth/account/logout.html
Normal file
|
@ -0,0 +1,11 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Signed Out" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Signed Out" %}</h1>
|
||||
|
||||
<p>{% trans "You have signed out." %}</p>
|
||||
{% endblock %}
|
14
itf/templates/allauth/account/password_change.html
Normal file
14
itf/templates/allauth/account/password_change.html
Normal file
|
@ -0,0 +1,14 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Change Password" %}</h1>
|
||||
|
||||
<form method="POST" action="" class="password_change">
|
||||
{% csrf_token %}
|
||||
{{ password_change_form.as_p }}
|
||||
<button type="submit" name="action">{% trans "Change Password" %}</button>
|
||||
</form>
|
||||
{% endblock %}
|
14
itf/templates/allauth/account/password_delete.html
Normal file
14
itf/templates/allauth/account/password_delete.html
Normal file
|
@ -0,0 +1,14 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Delete Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Delete Password" %}</h1>
|
||||
<p>{% blocktrans %}You may delete your password since you are currently logged in using OpenID.{% endblocktrans %}</p>
|
||||
<form method="post" action="">
|
||||
{% csrf_token %}
|
||||
<input type="submit" value="{% trans "delete my password" %}">
|
||||
</form>
|
||||
{% endblock %}
|
10
itf/templates/allauth/account/password_delete_done.html
Normal file
10
itf/templates/allauth/account/password_delete_done.html
Normal file
|
@ -0,0 +1,10 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Password Deleted" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Password Deleted" %}</h1>
|
||||
<p>{% blocktrans %}Your password has been deleted.{% endblocktrans %}</p>
|
||||
{% endblock %}
|
30
itf/templates/allauth/account/password_reset.html
Normal file
30
itf/templates/allauth/account/password_reset.html
Normal file
|
@ -0,0 +1,30 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans "Password Reset" %}</h1>
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
||||
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
|
||||
|
||||
<form method="POST" action="" class="password_reset">
|
||||
{% csrf_token %}
|
||||
{{ password_reset_form.as_p }}
|
||||
<input type="submit" value="{% trans "Reset My Password" %}" />
|
||||
</form>
|
||||
|
||||
<p>{% blocktrans %}If you have any trouble resetting your password, contact us at <a href="mailto:{{ CONTACT_EMAIL }}">{{ CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_body %}
|
||||
<script>
|
||||
$("#id_email").focus();
|
||||
</script>
|
||||
{% endblock %}
|
16
itf/templates/allauth/account/password_reset_done.html
Normal file
16
itf/templates/allauth/account/password_reset_done.html
Normal file
|
@ -0,0 +1,16 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Password Reset" %}</h1>
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
||||
<p>{% blocktrans %}We have sent you an e-mail. If you do not receive it within a few minutes, contact us at <a href="mailto:{{ CONTACT_EMAIL }}">{{ CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
|
||||
{% endblock %}
|
23
itf/templates/allauth/account/password_reset_from_key.html
Normal file
23
itf/templates/allauth/account/password_reset_from_key.html
Normal file
|
@ -0,0 +1,23 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
|
||||
|
||||
{% if token_fail %}
|
||||
{% url account_reset_password as passwd_reset_url %}
|
||||
<p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p>
|
||||
{% else %}
|
||||
{% if form %}
|
||||
<form method="POST" action="" class="uniForm">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<input type="submit" name="action" value="{% trans "change password" %}"/>
|
||||
</form>
|
||||
{% else %}
|
||||
<p>{% trans 'Your password is now changed.' %}</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
|
@ -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 %}
|
15
itf/templates/allauth/account/password_set.html
Normal file
15
itf/templates/allauth/account/password_set.html
Normal file
|
@ -0,0 +1,15 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Set Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Set Password" %}</h1>
|
||||
|
||||
<form method="POST" action="" class="password_set">
|
||||
{% csrf_token %}
|
||||
{{ password_set_form.as_p }}
|
||||
<input type="submit" name="action" value="{% trans "Set Password" %}"/>
|
||||
</form>
|
||||
{% endblock %}
|
27
itf/templates/allauth/account/signup.html
Normal file
27
itf/templates/allauth/account/signup.html
Normal file
|
@ -0,0 +1,27 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Signup" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Sign Up" %}</h1>
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% else %}
|
||||
<p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
|
||||
|
||||
<form class="signup" id="signup_form" method="post" action="{% url account_signup %}">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
||||
{% endif %}
|
||||
<button type="submit">{% trans "Sign Up" %} »</button>
|
||||
</form>
|
||||
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{% load i18n %}
|
||||
{% load account_tags %}
|
||||
|
||||
{% user_display user as user_display %}
|
||||
<p><strong>{% trans "Note" %}:</strong> {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}</p>
|
12
itf/templates/allauth/account/verification_sent.html
Normal file
12
itf/templates/allauth/account/verification_sent.html
Normal file
|
@ -0,0 +1,12 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Verify Your E-mail Address" %}</h1>
|
||||
|
||||
<p>{% blocktrans %}We have sent you an e-mail to <b>{{ email }}</b> for verification. Follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at <a href="mailto:{{ CONTACT_EMAIL }}">{{ CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
|
||||
|
||||
{% endblock %}
|
15
itf/templates/allauth/emailconfirmation/confirm_email.html
Normal file
15
itf/templates/allauth/emailconfirmation/confirm_email.html
Normal file
|
@ -0,0 +1,15 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "E-mail Address Confirmation" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "E-mail Address Confirmation" %}</h1>
|
||||
{% if email_address %}
|
||||
|
||||
<p>{% blocktrans with email_address.email as email and email_address.user as user %}You have confirmed that <a href="mailto:{{email}}">{{ email }}</a> is an e-mail address for user '{{ user }}'.{% endblocktrans %}</p>
|
||||
{% else %}
|
||||
<p>{% trans "Invalid confirmation key." %}</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
|
@ -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 %}
|
|
@ -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 %}
|
1
itf/templates/allauth/openid/base.html
Normal file
1
itf/templates/allauth/openid/base.html
Normal file
|
@ -0,0 +1 @@
|
|||
{% extends "socialaccount/base.html" %}
|
18
itf/templates/allauth/openid/login.html
Normal file
18
itf/templates/allauth/openid/login.html
Normal file
|
@ -0,0 +1,18 @@
|
|||
{% extends "openid/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}OpenID Sign In{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans 'OpenID Sign In' %}</h1>
|
||||
|
||||
|
||||
<form id="openid_login_form" class="openid_login" method="post" action="{% url openid_login %}">
|
||||
{% csrf_token %}
|
||||
{{form.as_p}}
|
||||
<button type="submit">Sign In</button>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
11
itf/templates/allauth/socialaccount/account_inactive.html
Normal file
11
itf/templates/allauth/socialaccount/account_inactive.html
Normal file
|
@ -0,0 +1,11 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Account Inactive" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Account Inactive" %}</h1>
|
||||
|
||||
<p>{% trans "This account is inactive." %}</p>
|
||||
{% endblock %}
|
|
@ -0,0 +1,11 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Social Network Login Failure" %}</h1>
|
||||
|
||||
<p>{% trans "An error occured while attempting to login via your social network account." %}</p>
|
||||
{% endblock %}
|
2
itf/templates/allauth/socialaccount/base.html
Normal file
2
itf/templates/allauth/socialaccount/base.html
Normal file
|
@ -0,0 +1,2 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
56
itf/templates/allauth/socialaccount/connections.html
Normal file
56
itf/templates/allauth/socialaccount/connections.html
Normal file
|
@ -0,0 +1,56 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Account Connections" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Account Connections" %}</h1>
|
||||
|
||||
{% if form.accounts %}
|
||||
<p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
|
||||
|
||||
|
||||
<form class="uniForm" method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
<fieldset class="blockLabels">
|
||||
{% if form.non_field_errors %}
|
||||
<div id="errorMsg">{{form.non_field_errors}}</div>
|
||||
{% endif %}
|
||||
|
||||
{% for base_account in form.accounts %}
|
||||
{% with base_account.get_provider_account as account %}
|
||||
<div class="ctrlHolder">
|
||||
<label for="id_account_{{base_account.id}}">
|
||||
<input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/>
|
||||
<span class="socialaccount_provider {{base_account.provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span>
|
||||
{{account}}
|
||||
</label>
|
||||
</div>
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
|
||||
<div class="buttonHolder">
|
||||
<button type="submit">Remove</button>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
</form>
|
||||
|
||||
{% else %}
|
||||
<p>You currently have no social network accounts connected to this account.</p>
|
||||
{% endif %}
|
||||
|
||||
<h2>{% trans 'Add a 3rd Party Account' %}</h2>
|
||||
|
||||
<ul class="socialaccount_providers">
|
||||
{% include "socialaccount/snippets/provider_list.html" %}
|
||||
</ul>
|
||||
|
||||
{% include "socialaccount/snippets/login_extra.html" %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
16
itf/templates/allauth/socialaccount/login_cancelled.html
Normal file
16
itf/templates/allauth/socialaccount/login_cancelled.html
Normal file
|
@ -0,0 +1,16 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Login Cancelled" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans "Login Cancelled" %}</h1>
|
||||
|
||||
{% url socialaccount_login as login_url %}
|
||||
|
||||
<p>{% blocktrans %}You decided to cancel logging in to our site using one of your exisiting accounts. If this was a mistake, please proceed to <a href="{{login_url}}">sign in</a>.{% endblocktrans %}</p>
|
||||
|
||||
{% endblock %}
|
||||
|
25
itf/templates/allauth/socialaccount/signup.html
Normal file
25
itf/templates/allauth/socialaccount/signup.html
Normal file
|
@ -0,0 +1,25 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Signup" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Sign Up" %}</h1>
|
||||
|
||||
<p>{% 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 %}</p>
|
||||
|
||||
<form class="signup" id="signup_form" method="post" action="">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
||||
{% endif %}
|
||||
<button type="submit">{% trans "Sign Up" %} »</button>
|
||||
</form>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
{% load socialaccount_tags %}
|
||||
|
||||
{% providers_media_js %}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{% load socialaccount_tags %}
|
||||
|
||||
{% for provider in socialaccount.providers %}
|
||||
{% if provider.id == "openid" %}
|
||||
{% for brand in provider.get_brands %}
|
||||
<li>
|
||||
<a title="{{brand.name}}"
|
||||
class="socialaccount_provider {{provider.id}} {{brand.id}}"
|
||||
href="{% provider_login_url provider.id openid=brand.openid_url %}"
|
||||
>{{brand.name}}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
<li>
|
||||
<a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
|
||||
href="{% provider_login_url provider.id %}">{{provider.name}}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<li><a href="/accounts/logout">Logout</a></li>
|
||||
{% else %}
|
||||
<li><a href="/accounts/login">Login</a></li>
|
||||
<li><a href="/accounts/register">Register</a></li>
|
||||
<li><a href="/accounts/signup">Register</a></li>
|
||||
{% endif %}
|
||||
|
||||
<li><a href="/contact">Contact Us</a></li>
|
||||
|
|
|
@ -71,7 +71,7 @@ $(function(){
|
|||
//console.log(item);
|
||||
//return "<div>" + item.first_name + " " + item.last_name + "<div>" + item.about + "</div></div>";
|
||||
//console.log("foo");
|
||||
return item.first_name + " " + item.last_name;
|
||||
return item.text;
|
||||
//return "<div data-id='" + item.id + "'>" + item.first_name + " " + item.last_name + "</div>";
|
||||
},
|
||||
createSearchChoice: function(term) {
|
||||
|
|
|
@ -33,7 +33,9 @@ urlpatterns = patterns('',
|
|||
# (r'site.json', 'app.views.site_json'),
|
||||
(r'^itf/(?P<old_url>.*)', '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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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__)))
|
||||
|
|
Loading…
Reference in New Issue
Block a user