[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit bc43e0e6ad7aa9f90f581c450faafb3e7f8fa525
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 19:37:40 2010 -0400

    Partially integrate django-registration.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/live_studio/settings/defaults/apps.py b/live_studio/settings/defaults/apps.py
index e82975b..c10d0a2 100644
--- a/live_studio/settings/defaults/apps.py
+++ b/live_studio/settings/defaults/apps.py
@@ -6,6 +6,8 @@ INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.messages',
 
+    'registration',
+
     'live_studio.auth',
     'live_studio.build',
     'live_studio.utils',
diff --git a/live_studio/settings/defaults/misc.py b/live_studio/settings/defaults/misc.py
index c574419..1dd3ee9 100644
--- a/live_studio/settings/defaults/misc.py
+++ b/live_studio/settings/defaults/misc.py
@@ -57,3 +57,7 @@ TEMPLATE_LOADERS = (
 )
 
 ROOT_URLCONF = 'live_studio.urls'
+
+LOGIN_REDIRECT_URL = '/configs'
+
+ACCOUNT_ACTIVATION_DAYS = 7
diff --git a/live_studio/urls.py b/live_studio/urls.py
index 826754d..4ec9b4c 100644
--- a/live_studio/urls.py
+++ b/live_studio/urls.py
@@ -5,6 +5,8 @@ admin.autodiscover()
 
 urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
+    (r'^accounts/', include('registration.urls')),
+
     (r'', include('live_studio.debug.urls', namespace='debug')),
     (r'', include('live_studio.build.urls', namespace='build')),
     (r'', include('live_studio.config.urls', namespace='config')),
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
new file mode 100644
index 0000000..f13e2cd
--- /dev/null
+++ b/templates/registration/activation_email.txt
@@ -0,0 +1,10 @@
+
+Hi!
+
+Please activate your Debian Live Studio account by visiting
+the following URL:
+
+  http://{{ site.domain }}/{% url registration_activate activation_key %}
+
+
+-- Debian Live Studio
diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
new file mode 100644
index 0000000..89c2613
--- /dev/null
+++ b/templates/registration/activation_email_subject.txt
@@ -0,0 +1 @@
+Please activate your Debian Live Studio account
diff --git a/templates/registration/login.html b/templates/registration/login.html
new file mode 100644
index 0000000..48bcfb7
--- /dev/null
+++ b/templates/registration/login.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h1>Login</h1>
+
+<form method="post" action="">{% csrf_token %}
+{{ form.as_p }}
+<input type="submit" value="Login">
+</form>
+
+{% endblock %}
diff --git a/templates/static/welcome.html b/templates/registration/logout.html
similarity index 58%
copy from templates/static/welcome.html
copy to templates/registration/logout.html
index 3fa212b..ca646e8 100644
--- a/templates/static/welcome.html
+++ b/templates/registration/logout.html
@@ -2,6 +2,8 @@
 
 {% block content %}
 
-<h1>Welcome</h1>
+<h1>Logged out</h1>
+
+You have been logged out
 
 {% endblock %}
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
new file mode 100644
index 0000000..1c34315
--- /dev/null
+++ b/templates/registration/registration_complete.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h1>Registration complete..</h1>
+
+<p>Please check your email.</p>
+
+{% endblock %}
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
new file mode 100644
index 0000000..9803032
--- /dev/null
+++ b/templates/registration/registration_form.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h1>Register</h1>
+
+<form method="post" action="">{% csrf_token %}
+{{ form.as_p }}
+<input type="submit" value="Register">
+</form>
+
+{% endblock %}

-- 
live-studio