registration stuff
This commit is contained in:
parent
711fff12ea
commit
b323e1c5ae
|
@ -135,6 +135,7 @@ INSTALLED_APPS = (
|
|||
'django.contrib.sites',
|
||||
'django.contrib.admin',
|
||||
'django.contrib.comments',
|
||||
'registration',
|
||||
# 'itfcore',
|
||||
'festival',
|
||||
'erang_organised',
|
||||
|
@ -156,6 +157,7 @@ INSTALLED_APPS = (
|
|||
'ckeditor',
|
||||
)
|
||||
|
||||
ACCOUNT_ACTIVATION_DAYS = 30
|
||||
#overwrite default settings with local settings
|
||||
try:
|
||||
from local_settings import *
|
||||
|
|
53
itf/templates/registration/.svn/all-wcprops
Normal file
53
itf/templates/registration/.svn/all-wcprops
Normal file
|
@ -0,0 +1,53 @@
|
|||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 81
|
||||
/svn/!svn/ver/14003/django/trunk/django/contrib/auth/tests/templates/registration
|
||||
END
|
||||
password_reset_complete.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 110
|
||||
/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_complete.html
|
||||
END
|
||||
password_reset_confirm.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 109
|
||||
/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_confirm.html
|
||||
END
|
||||
password_reset_form.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 106
|
||||
/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_form.html
|
||||
END
|
||||
logged_out.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 97
|
||||
/svn/!svn/ver/14003/django/trunk/django/contrib/auth/tests/templates/registration/logged_out.html
|
||||
END
|
||||
login.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 91
|
||||
/svn/!svn/ver/8497/django/trunk/django/contrib/auth/tests/templates/registration/login.html
|
||||
END
|
||||
password_reset_done.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 106
|
||||
/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_done.html
|
||||
END
|
||||
password_change_form.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 107
|
||||
/svn/!svn/ver/14003/django/trunk/django/contrib/auth/tests/templates/registration/password_change_form.html
|
||||
END
|
||||
password_reset_email.html
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 107
|
||||
/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_email.html
|
||||
END
|
300
itf/templates/registration/.svn/entries
Normal file
300
itf/templates/registration/.svn/entries
Normal file
|
@ -0,0 +1,300 @@
|
|||
10
|
||||
|
||||
dir
|
||||
15449
|
||||
http://code.djangoproject.com/svn/django/trunk/django/contrib/auth/tests/templates/registration
|
||||
http://code.djangoproject.com/svn
|
||||
|
||||
|
||||
|
||||
2010-10-08T13:50:54.908742Z
|
||||
14003
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
bcc190cf-cafb-0310-a4f2-bffc1f526a37
|
||||
|
||||
password_reset_complete.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
b086e39450cc1801a75d6eb86f9642b8
|
||||
2010-02-13T12:02:11.708906Z
|
||||
12420
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
27
|
||||
|
||||
password_reset_confirm.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
8c94e1c987778dc8ff3376e7fa38d5ae
|
||||
2010-02-13T12:02:11.708906Z
|
||||
12420
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
120
|
||||
|
||||
password_reset_form.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
c940547712a34ed88f1ce2fbbd0defee
|
||||
2010-02-13T12:02:11.708906Z
|
||||
12420
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
10
|
||||
|
||||
logged_out.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
213c9cdec05da9c0102d625e71d52769
|
||||
2010-10-08T13:50:54.908742Z
|
||||
14003
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
10
|
||||
|
||||
login.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
e56718e1b6e87fb618d296bb52cd15ee
|
||||
2008-08-23T18:20:49.470504Z
|
||||
8497
|
||||
mtredinnick
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
16
|
||||
|
||||
password_reset_done.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
6e96998ce833f63031ef6f66a7693586
|
||||
2010-02-13T12:02:11.708906Z
|
||||
12420
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
11
|
||||
|
||||
password_change_form.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
c940547712a34ed88f1ce2fbbd0defee
|
||||
2010-10-08T13:50:54.908742Z
|
||||
14003
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
10
|
||||
|
||||
password_reset_email.html
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2011-02-08T11:05:45.677065Z
|
||||
3c3a5c49b9d1b6802ca1dfe360a06a64
|
||||
2010-02-13T12:02:11.708906Z
|
||||
12420
|
||||
russellm
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
58
|
||||
|
|
@ -0,0 +1 @@
|
|||
Logged out
|
|
@ -0,0 +1 @@
|
|||
{{ form.as_ul }}
|
|
@ -0,0 +1 @@
|
|||
{{ form }}
|
|
@ -0,0 +1 @@
|
|||
Password reset successfully
|
|
@ -0,0 +1,5 @@
|
|||
{% if validlink %}
|
||||
Please enter your new password: {{ form }}
|
||||
{% else %}
|
||||
The password reset link was invalid
|
||||
{% endif %}
|
|
@ -0,0 +1 @@
|
|||
E-mail sent
|
|
@ -0,0 +1 @@
|
|||
{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/
|
|
@ -0,0 +1 @@
|
|||
{{ form }}
|
4
itf/templates/registration/activate.html
Normal file
4
itf/templates/registration/activate.html
Normal file
|
@ -0,0 +1,4 @@
|
|||
{% extends 'registration/register_base.html' %}
|
||||
{% block reg_content %}
|
||||
Account activation failed.
|
||||
{% endblock %}
|
5
itf/templates/registration/activation_complete.html
Normal file
5
itf/templates/registration/activation_complete.html
Normal file
|
@ -0,0 +1,5 @@
|
|||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
Account activated. Thanks.
|
||||
{% endblock %}
|
1
itf/templates/registration/activation_email.txt
Normal file
1
itf/templates/registration/activation_email.txt
Normal file
|
@ -0,0 +1 @@
|
|||
Please activate your registration. How, remains a mystery.
|
1
itf/templates/registration/activation_email_subject.txt
Normal file
1
itf/templates/registration/activation_email_subject.txt
Normal file
|
@ -0,0 +1 @@
|
|||
Please Confirm Registration on Theatreforum.in
|
|
@ -1,12 +1,20 @@
|
|||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n %}
|
||||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a></div>{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% block title %}
|
||||
Logout
|
||||
{% endblock %}
|
||||
|
||||
<p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
|
||||
{% block extra_head %}
|
||||
<link rel="stylesheet" href="/static/css/files/logout.css" />
|
||||
{% endblock %}
|
||||
|
||||
<p><a href="../">{% trans 'Log in again' %}</a></p>
|
||||
{% block pageTitle %}
|
||||
Logout
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block reg_content %}
|
||||
<div id="loggedOut">You have been logged out. <br />Thanks for using the site, and see you again soon!<br /> Bye!<br /> :)</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
23
itf/templates/registration/login.html
Normal file
23
itf/templates/registration/login.html
Normal file
|
@ -0,0 +1,23 @@
|
|||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block title %}
|
||||
Login
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_head %}
|
||||
<link rel="stylesheet" href="/static/css/files/login.css" />
|
||||
{% endblock %}
|
||||
|
||||
{% block pageTitle %}
|
||||
Login
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="loginWrapper">
|
||||
<form action="" method="POST">
|
||||
{{ form.as_ul }}<br />
|
||||
<input type="submit" value="Submit" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
|
@ -1,26 +1,5 @@
|
|||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n %}
|
||||
{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
|
||||
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> › {% trans 'Password change' %}</div>{% endblock %}
|
||||
|
||||
{% block title %}{% trans 'Password change' %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans 'Password change' %}</h1>
|
||||
|
||||
<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
|
||||
|
||||
<form action="" method="post">
|
||||
|
||||
{{ form.old_password.errors }}
|
||||
<p class="aligned wide"><label for="id_old_password">{% trans 'Old password:' %}</label>{{ form.old_password }}</p>
|
||||
{{ form.new_password1.errors }}
|
||||
<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
|
||||
{{ form.new_password2.errors }}
|
||||
<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
|
||||
|
||||
<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
|
||||
</form>
|
||||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
{{ form }}
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,16 +1,5 @@
|
|||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> › {% trans 'Password reset' %}</div>{% endblock %}
|
||||
|
||||
{% block title %}{% trans 'Password reset complete' %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans 'Password reset complete' %}</h1>
|
||||
|
||||
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
|
||||
|
||||
<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
|
||||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
Password reset successfully
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,32 +1,10 @@
|
|||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> › {% trans 'Password reset confirmation' %}</div>{% endblock %}
|
||||
|
||||
{% block title %}{% trans 'Password reset' %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
{% if validlink %}
|
||||
|
||||
<h1>{% trans 'Enter new password' %}</h1>
|
||||
|
||||
<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
|
||||
|
||||
<form action="" method="post">
|
||||
{{ form.new_password1.errors }}
|
||||
<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
|
||||
{{ form.new_password2.errors }}
|
||||
<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
|
||||
<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
|
||||
</form>
|
||||
|
||||
Please enter your new password: {{ form }}
|
||||
{% else %}
|
||||
|
||||
<h1>{% trans 'Password reset unsuccessful' %}</h1>
|
||||
|
||||
<p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}
|
||||
|
||||
The password reset link was invalid
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,14 +1,5 @@
|
|||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> › {% trans 'Password reset' %}</div>{% endblock %}
|
||||
|
||||
{% block title %}{% trans 'Password reset successful' %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans 'Password reset successful' %}</h1>
|
||||
|
||||
<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
|
||||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
E-mail sent
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,15 +1 @@
|
|||
{% load i18n %}{% autoescape off %}
|
||||
{% trans "You're receiving this e-mail because you requested a password reset" %}
|
||||
{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
|
||||
|
||||
{% trans "Please go to the following page and choose a new password:" %}
|
||||
{% block reset_link %}
|
||||
{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
|
||||
{% endblock %}
|
||||
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
|
||||
|
||||
{% trans "Thanks for using our site!" %}
|
||||
|
||||
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
|
||||
|
||||
{% endautoescape %}
|
||||
{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/
|
|
@ -1,19 +1,5 @@
|
|||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> › {% trans 'Password reset' %}</div>{% endblock %}
|
||||
|
||||
{% block title %}{% trans "Password reset" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans "Password reset" %}</h1>
|
||||
|
||||
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
|
||||
|
||||
<form action="" method="post">
|
||||
{{ form.email.errors }}
|
||||
<p><label for="id_email">{% trans 'E-mail address:' %}</label> {{ form.email }} <input type="submit" value="{% trans 'Reset my password' %}" /></p>
|
||||
</form>
|
||||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
{{ form }}
|
||||
{% endblock %}
|
||||
|
|
9
itf/templates/registration/register_base.html
Normal file
9
itf/templates/registration/register_base.html
Normal file
|
@ -0,0 +1,9 @@
|
|||
{% extends "noel/base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% block reg_content %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% endblock %}
|
5
itf/templates/registration/registration_complete.html
Normal file
5
itf/templates/registration/registration_complete.html
Normal file
|
@ -0,0 +1,5 @@
|
|||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
Registered.
|
||||
{% endblock %}
|
8
itf/templates/registration/registration_form.html
Normal file
8
itf/templates/registration/registration_form.html
Normal file
|
@ -0,0 +1,8 @@
|
|||
{% extends 'registration/register_base.html' %}
|
||||
|
||||
{% block reg_content %}
|
||||
<form action="" method="POST">
|
||||
{{ form.as_p }}
|
||||
<input type="submit" value="Submit" />
|
||||
</form>
|
||||
{% endblock %}
|
|
@ -3,6 +3,7 @@ import settings
|
|||
import os
|
||||
from os.path import join
|
||||
from django.views.generic.simple import direct_to_template
|
||||
# from django.auth.views import login, logout, register,
|
||||
|
||||
# Uncomment the next two lines to enable the admin:
|
||||
from django.contrib import admin
|
||||
|
@ -24,7 +25,7 @@ urlpatterns = patterns('',
|
|||
(r'jsdoc/', 'api.views.jsdoc'),
|
||||
(r'site.json', 'app.views.site_json'),
|
||||
(r'^itf/', include('festival.urls')),
|
||||
|
||||
(r'^accounts/', include('registration.urls')),
|
||||
(r'^admin/(.*)', admin.site.root),
|
||||
('^getLanguages', 'itfcore.views.getLanguages'),
|
||||
# Uncomment the admin/doc line below and add 'django.contrib.admindocs'
|
||||
|
|
Loading…
Reference in New Issue
Block a user