merged and made changes

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
-    })
+    }))
-
-
-      

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'),
 )

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>

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 }}/

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 %}

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 %}