Added registration through django-registration

11 files changed, 81 insertions, 2 deletions

diff --git a/chishop/settings.py b/chishop/settings.py
index 00cf06d..39ddec7 100644
--- a/chishop/settings.py
+++ b/chishop/settings.py
@@ -16,6 +16,9 @@ DJANGOPYPI_RELEASE_UPLOAD_TO = 'dists'
 # change to False if you do not want Django's default server to serve static pages
 LOCAL_DEVELOPMENT = True
 
+ACCOUNT_ACTIVATION_DAYS = 7
+LOGIN_REDIRECT_URL = "/"
+
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = ''
@@ -77,6 +80,14 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'urls'
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.core.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.request",
+)
+
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
@@ -92,5 +103,6 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.markup',
     'django.contrib.admindocs',
+    'registration',
     'djangopypi',
 )
diff --git a/chishop/templates/base.html b/chishop/templates/base.html
index cc21bf5..2863343 100644
--- a/chishop/templates/base.html
+++ b/chishop/templates/base.html
@@ -20,6 +20,16 @@
         {% block site_logo %}{% endblock %}
         <h1 id="site-name">{% block site_name_header %}{% endblock %}</h1>
         </div>
+
+        <div id="user-tools">
+          {% if user.is_authenticated %}
+          Welcome, <strong>{{user.username}}</strong>.
+          <a href="{% url django.contrib.auth.views.logout%}?next={{request.path}}">Log out</a>
+          {% else %}
+          <a href="{% url django.contrib.auth.views.login %}?next={{request.path}}">Login</a> /
+          <a href="{% url registration_register%}">Register</a>
+          {% endif %}
+        </div>
     </div>
     <!-- END Header -->
 
@@ -60,4 +70,3 @@
 
 </body>
 </html>
-
diff --git a/chishop/templates/registration/activate.html b/chishop/templates/registration/activate.html
new file mode 100644
index 0000000..bc67771
--- /dev/null
+++ b/chishop/templates/registration/activate.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Activation Failed</h1>
+<p>
+  Activation with key {{activation_key}} failed.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/activation_complete.html b/chishop/templates/registration/activation_complete.html
new file mode 100644
index 0000000..553cf2c
--- /dev/null
+++ b/chishop/templates/registration/activation_complete.html
@@ -0,0 +1,9 @@
+{% extends "base_site.html" %}
+
+{% block main_content %}
+<h1>Activation complete.</h1>
+<p>
+  Hello {{account}}, you are registered.
+  <a href="/">here</a> to get back to the main page.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/activation_email.txt b/chishop/templates/registration/activation_email.txt
new file mode 100644
index 0000000..0a25329
--- /dev/null
+++ b/chishop/templates/registration/activation_email.txt
@@ -0,0 +1,6 @@
+Welcome to Chishop.
+
+Please click here to activate your account:
+http://{{site}}/accounts/activate/{{activation_key}}/
+
+Account has to be activated within {{expiration_days}} days.
diff --git a/chishop/templates/registration/activation_email_subject.txt b/chishop/templates/registration/activation_email_subject.txt
new file mode 100644
index 0000000..93618cc
--- /dev/null
+++ b/chishop/templates/registration/activation_email_subject.txt
@@ -0,0 +1 @@
+Account Activation - {{ site }}
diff --git a/chishop/templates/registration/login.html b/chishop/templates/registration/login.html
new file mode 100644
index 0000000..6c7f799
--- /dev/null
+++ b/chishop/templates/registration/login.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<form method="post" action="">
+  {{form.as_p}}
+  <input type="submit" value="Login">
+</form>
+{% endblock %}
diff --git a/chishop/templates/registration/logout.html b/chishop/templates/registration/logout.html
new file mode 100644
index 0000000..06483a8
--- /dev/null
+++ b/chishop/templates/registration/logout.html
@@ -0,0 +1,7 @@
+{% extends "base_site.html" %}
+
+{% block main_content %}
+<p>
+  {%trans "Logged out."%}
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/registration_complete.html b/chishop/templates/registration/registration_complete.html
new file mode 100644
index 0000000..d9a19cf
--- /dev/null
+++ b/chishop/templates/registration/registration_complete.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Registration complete</h1>
+<p>
+  An activation mail has been sent to you.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/registration_form.html b/chishop/templates/registration/registration_form.html
new file mode 100644
index 0000000..719a875
--- /dev/null
+++ b/chishop/templates/registration/registration_form.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Register</h1>
+<form method="post" action="">
+  {{form.as_p}}
+<input type="submit" value="Register">
+{% endblock %}
diff --git a/chishop/urls.py b/chishop/urls.py
index b9f3e65..ab2e8a9 100644
--- a/chishop/urls.py
+++ b/chishop/urls.py
@@ -18,6 +18,9 @@ urlpatterns += patterns("",
     url(r'^admin/doc/', include("django.contrib.admindocs.urls")),
     url(r'^admin/(.*)', admin.site.root),
 
+    # Registration
+    url(r'^accounts/', include('registration.backends.default.urls')),
+
+    # The Chishop
     url(r'', include("djangopypi.urls"))
 )
-