From f8820abf55c09ecfbbf5158c33540a00580df1c3 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Wed, 3 Aug 2011 20:53:40 +0530
Subject: [PATCH 1/3] activation email

---
 itf/templates/registration/activation_email.txt       | 2 +-
 itf/templates/registration/registration_complete.html | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/itf/templates/registration/activation_email.txt b/itf/templates/registration/activation_email.txt
index 60e6528..3594c80 100644
--- a/itf/templates/registration/activation_email.txt
+++ b/itf/templates/registration/activation_email.txt
@@ -1 +1 @@
-Please activate your registration. How, remains a mystery.
+Please activate your registration by clicking on this link: http://theatreforum.in/accounts/activate/{{ activation_key }}/
diff --git a/itf/templates/registration/registration_complete.html b/itf/templates/registration/registration_complete.html
index a89ef48..ff8edd0 100644
--- a/itf/templates/registration/registration_complete.html
+++ b/itf/templates/registration/registration_complete.html
@@ -1,5 +1,7 @@
 {% extends 'registration/register_base.html' %}
 
 {% block reg_content %}
-    Registered.
+    Thanks for registering! <br />
+    You will be sent an activation link at the email address you provided.<br />
+    Please click on it to complete the registration process.
 {% endblock %}

From e88e9940b8c7bad21d9661181410d1c8e6d69572 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Wed, 3 Aug 2011 21:27:53 +0530
Subject: [PATCH 2/3] registration email, conditional for login / logout in
 template

---
 itf/frontpage/views.py                 |  9 +++------
 itf/settings.py                        |  4 +++-
 itf/templates/noel/base.html           | 10 ++++++++--
 itf/templates/registration/logout.html |  4 ++++
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 itf/templates/registration/logout.html

diff --git a/itf/frontpage/views.py b/itf/frontpage/views.py
index 4016eb4..29f1413 100644
--- a/itf/frontpage/views.py
+++ b/itf/frontpage/views.py
@@ -3,7 +3,7 @@ from django.shortcuts import render_to_response
 from models import *
 from settings import TWITTER_ID
 import twitter
-
+from django.template import RequestContext
 
 def index(request):
     tApi = twitter.Api()
@@ -17,11 +17,8 @@ def index(request):
             'items': [{'name': item.name, 'url': item.url} for item in m.menuitem_set.all()]
         }
         menus.append(d)
-    return render_to_response("noel/index.html", {
+    return render_to_response("noel/index.html", RequestContext(request, {
         'tweets': statuses[0:5],
         'boxes': boxes,
         'menus': menus
-    })
-
-
-      
+    }))
diff --git a/itf/settings.py b/itf/settings.py
index 9e88175..fbc44ba 100644
--- a/itf/settings.py
+++ b/itf/settings.py
@@ -23,6 +23,8 @@ CKEDITOR_UPLOAD_PATH = join(PROJECT_PATH, "static/upload/images/")
 
 AUTH_PROFILE_MODULE = "profiles.Person"
 
+LOGIN_REDIRECT_URL = "/t/"
+
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -38,7 +40,7 @@ DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
-TWITTER_ID = "sachin_rt"
+TWITTER_ID = "indtheatreforum"
 
 CACHES = {
     'default': {
diff --git a/itf/templates/noel/base.html b/itf/templates/noel/base.html
index 68d49d9..885b099 100644
--- a/itf/templates/noel/base.html
+++ b/itf/templates/noel/base.html
@@ -70,8 +70,14 @@
 		</ul>
 	  
 	  <ul id="loginMenu">
-		<li><a href="">Login</a></li>
-		<li><a href="">Register</a></li>
+
+        {% if user.is_authenticated %}
+            <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>
+        {% endif %}
+
 		<li><a href="">Contact Us</a></li>
 	  </ul>
 	</div>
diff --git a/itf/templates/registration/logout.html b/itf/templates/registration/logout.html
new file mode 100644
index 0000000..d12df4a
--- /dev/null
+++ b/itf/templates/registration/logout.html
@@ -0,0 +1,4 @@
+{% extends 'registration/register_base.html' %}
+{% block reg_content %}
+    Logged out. Thanks for using the website. Have a nice day!
+{% endblock %}

From f031f80de7436c574babe7ce527b63ea5cead5b9 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Wed, 3 Aug 2011 21:31:03 +0530
Subject: [PATCH 3/3] twitter id back to sachin for testing

---
 itf/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itf/settings.py b/itf/settings.py
index fbc44ba..fdab69c 100644
--- a/itf/settings.py
+++ b/itf/settings.py
@@ -40,7 +40,7 @@ DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
-TWITTER_ID = "indtheatreforum"
+TWITTER_ID = "sachin_rt"
 
 CACHES = {
     'default': {