Mercurial > hg > bts-webui
changeset 168:e0f4dccd70f6 draft
Removed embedded copy of python-django-registration
| author | eriol-guest |
|---|---|
| date | Thu, 07 Jul 2011 03:38:47 +0000 |
| parents | ecc41e392805 |
| children | 992a9db773e9 |
| files | bts_webui/registration/templates/registration/activate.html bts_webui/registration/templates/registration/activation_email.txt bts_webui/registration/templates/registration/login.html bts_webui/registration/templates/registration/logout.html bts_webui/registration/templates/registration/registration_complete.html bts_webui/registration/templates/registration/registration_form.html bts_webui/settings.py bts_webui/templates/registration/activate.html bts_webui/templates/registration/activation_email.txt bts_webui/templates/registration/login.html bts_webui/templates/registration/logout.html bts_webui/templates/registration/registration_complete.html bts_webui/templates/registration/registration_form.html |
| diffstat | 13 files changed, 120 insertions(+), 118 deletions(-) [+] |
line wrap: on
line diff
deleted file mode 100644 --- a/bts_webui/registration/templates/registration/activate.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Account activation{% endblock %} - -{% block main_content %} -<h3 class="account_title">Account activation</h3> -{% load humanize %} -{% if account %} -<p>Thanks for signing up! Now you can <a href="/accounts/login/">log in</a> -and start working!</p> -{% else %} -<p>Either your activation link was incorrect, or the activation key for your account has expired; activation keys are only -valid for {{ expiration_days|apnumber }} days after registration.</p> -{% endif %} -{% endblock %}
deleted file mode 100644 --- a/bts_webui/registration/templates/registration/activation_email.txt +++ /dev/null @@ -1,7 +0,0 @@ -{% load humanize %} -Someone, hopefully you, signed up for a new account at {{ site_url }} using this email address. If it was you, and you'd like to activate and use your account, click the link below or copy and paste it into your web browser's address bar: - -{{ site_url }}accounts/activate/{{ activation_key }}/ - -If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days|apnumber }} days. -
deleted file mode 100644 --- a/bts_webui/registration/templates/registration/login.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Log in{% endblock %} - -{% block main_content %} - -<div class="info">If you don't have an account, you can <a -href="/accounts/register/">sign up</a> for one.<br/> -It's free, and you'll get access to a bunch of nifty features.</div> - -{% if form.errors %} -<p class="error">Please correct the errors below:</p> -{% endif %} -<div class="account_form"> - <form method="post" action="{% url django.contrib.auth.views.login %}"> - <table> - <tr> - <td><label for="id_username">Username:</label></td> - <td>{% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span>{% endif %} {{ form.username }}</td> - </tr> - <tr> - <td><label for="id_password">Password:</label></td> - <td>{% if form.password.errors %} <span class="error">{{ form.password.errors|join:", " }}</span>{% endif %} {{ form.password }}</td> - </tr> - <tr> - <td colspan="2" class="button_box"><input class="submit" type="submit" value="Log in" /></td> - </tr> - </table> - </form> -</div> -{% endblock %}
deleted file mode 100644 --- a/bts_webui/registration/templates/registration/logout.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Logged out{% endblock %} - -{% block main_content %} -<h3 class="account_title">Logged out</h3> -<div class="account_coment">You are no longer logged in. You can -<a href="/">continue browsing</a> as an anonymous user.</div> -{% endblock %} - -
deleted file mode 100644 --- a/bts_webui/registration/templates/registration/registration_complete.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Registration complete{% endblock %} - -{% block main_content %} -<h3 class="account_title">Registration complete</h3> -<div> -Registration has been completed successfully. -<br/><br/> -A mail has been sent to your inbox with instructions on how -to finish your registration. Please visit the link included in that mail. -You can now <a href="/">go back</a> to the original site.</div> -{% endblock %} -
deleted file mode 100644 --- a/bts_webui/registration/templates/registration/registration_form.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Sign up{% endblock %} - - -{% block main_content %} - -{% if form.errors %} -<p class="error">Please correct the errors below:</p> -{% endif %} - -<div class="account_form"> -<form method="post" action=""> -<fieldset class="account_form"> -<legend class="account_title">Sign up</legend> -<ol class="account_form"> -<li><dt><label for="id_username">Username:</label>{% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span>{% endif %}</dt> -<dd>{{ form.username|safe }}</dd></li> -<li><dt><label for="id_email">Email address:</label>{% if form.email.errors %} <span class="error">{{ form.email.errors|join:", " }}</span>{% endif %}</dd> -<dd>{{ form.email|safe }}</dd></li> -<li><dt><label for="id_password1">Password:</label>{% if form.password1.errors %} <span class="error">{{ form.password2.errors|join:", " }}</span>{% endif %}</dt> -<dd>{{ form.password1|safe }}</dd></li> -<li><dt><label for="id_password2">Password (type again to catch typos):</label>{% if form.password2.errors %} <span class="error">{{ form.password2.errors|join:", " }}</span>{% endif %}</dt> -<dd>{{ form.password2|safe }}</dd></li> -</ol> -<dt><input class="submit" type="submit" value="Register" /></dt> -</dl> -</fieldset> -</form> -</div> - -<div class="account_comment">Fill out the form to the left (all fields are -required), and your account will be created; you'll be sent an email with -instructions on how to finish your registration.</div> -{% endblock %}
--- a/bts_webui/settings.py +++ b/bts_webui/settings.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # Django settings for debbugs_ui project. DEBUG = True @@ -77,10 +78,11 @@ ROOT_URLCONF = 'bts_webui.urls' TEMPLATE_DIRS = ( - "amancay/templates/", - "registration/templates/" - # Put strings here, like "/home/html/django_templates". - # Always use forward slashes, even on Windows. +# 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. +"amancay/templates/", +"templates/" ) INSTALLED_APPS = ( @@ -90,6 +92,6 @@ 'django.contrib.humanize', 'django.contrib.admin', 'django.contrib.sites', + 'registration', 'bts_webui.amancay', - 'bts_webui.registration' )
new file mode 100644 --- /dev/null +++ b/bts_webui/templates/registration/activate.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block title %}Account activation{% endblock %} + +{% block main_content %} +<h3 class="account_title">Account activation</h3> +{% load humanize %} +{% if account %} +<p>Thanks for signing up! Now you can <a href="/accounts/login/">log in</a> +and start working!</p> +{% else %} +<p>Either your activation link was incorrect, or the activation key for your account has expired; activation keys are only +valid for {{ expiration_days|apnumber }} days after registration.</p> +{% endif %} +{% endblock %}
new file mode 100644 --- /dev/null +++ b/bts_webui/templates/registration/activation_email.txt @@ -0,0 +1,7 @@ +{% load humanize %} +Someone, hopefully you, signed up for a new account at {{ site_url }} using this email address. If it was you, and you'd like to activate and use your account, click the link below or copy and paste it into your web browser's address bar: + +{{ site_url }}accounts/activate/{{ activation_key }}/ + +If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days|apnumber }} days. +
new file mode 100644 --- /dev/null +++ b/bts_webui/templates/registration/login.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} + +{% block title %}Log in{% endblock %} + +{% block main_content %} + +<div class="info">If you don't have an account, you can <a +href="/accounts/register/">sign up</a> for one.<br/> +It's free, and you'll get access to a bunch of nifty features.</div> + +{% if form.errors %} +<p class="error">Please correct the errors below:</p> +{% endif %} +<div class="account_form"> + <form method="post" action="{% url django.contrib.auth.views.login %}"> + <table> + <tr> + <td><label for="id_username">Username:</label></td> + <td>{% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span>{% endif %} {{ form.username }}</td> + </tr> + <tr> + <td><label for="id_password">Password:</label></td> + <td>{% if form.password.errors %} <span class="error">{{ form.password.errors|join:", " }}</span>{% endif %} {{ form.password }}</td> + </tr> + <tr> + <td colspan="2" class="button_box"><input class="submit" type="submit" value="Log in" /></td> + </tr> + </table> + </form> +</div> +{% endblock %}
new file mode 100644 --- /dev/null +++ b/bts_webui/templates/registration/logout.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block title %}Logged out{% endblock %} + +{% block main_content %} +<h3 class="account_title">Logged out</h3> +<div class="account_coment">You are no longer logged in. You can +<a href="/">continue browsing</a> as an anonymous user.</div> +{% endblock %} + +
new file mode 100644 --- /dev/null +++ b/bts_webui/templates/registration/registration_complete.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block title %}Registration complete{% endblock %} + +{% block main_content %} +<h3 class="account_title">Registration complete</h3> +<div> +Registration has been completed successfully. +<br/><br/> +A mail has been sent to your inbox with instructions on how +to finish your registration. Please visit the link included in that mail. +You can now <a href="/">go back</a> to the original site.</div> +{% endblock %} +
new file mode 100644 --- /dev/null +++ b/bts_webui/templates/registration/registration_form.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} + +{% block title %}Sign up{% endblock %} + + +{% block main_content %} + +{% if form.errors %} +<p class="error">Please correct the errors below:</p> +{% endif %} + +<div class="account_form"> +<form method="post" action=""> +<fieldset class="account_form"> +<legend class="account_title">Sign up</legend> +<ol class="account_form"> +<li><dt><label for="id_username">Username:</label>{% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span>{% endif %}</dt> +<dd>{{ form.username|safe }}</dd></li> +<li><dt><label for="id_email">Email address:</label>{% if form.email.errors %} <span class="error">{{ form.email.errors|join:", " }}</span>{% endif %}</dd> +<dd>{{ form.email|safe }}</dd></li> +<li><dt><label for="id_password1">Password:</label>{% if form.password1.errors %} <span class="error">{{ form.password2.errors|join:", " }}</span>{% endif %}</dt> +<dd>{{ form.password1|safe }}</dd></li> +<li><dt><label for="id_password2">Password (type again to catch typos):</label>{% if form.password2.errors %} <span class="error">{{ form.password2.errors|join:", " }}</span>{% endif %}</dt> +<dd>{{ form.password2|safe }}</dd></li> +</ol> +<dt><input class="submit" type="submit" value="Register" /></dt> +</dl> +</fieldset> +</form> +</div> + +<div class="account_comment">Fill out the form to the left (all fields are +required), and your account will be created; you'll be sent an email with +instructions on how to finish your registration.</div> +{% endblock %}