# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1253903065 -19800
# Node ID f0b5ff862c6d8232044bca023ff229e973e8c235
# Parent  4976650293f4afbb23eb87a9515f94859477946b
Added django-registration and its settings.

diff -r 4976650293f4 -r f0b5ff862c6d .hgignore
diff -r 4976650293f4 -r f0b5ff862c6d __init__.py
diff -r 4976650293f4 -r f0b5ff862c6d apache/django.wsgi
diff -r 4976650293f4 -r f0b5ff862c6d conference/__init__.py
diff -r 4976650293f4 -r f0b5ff862c6d conference/forms.py
--- a/conference/forms.py	Fri Sep 25 00:55:37 2009 +0530
+++ b/conference/forms.py	Fri Sep 25 23:54:25 2009 +0530
@@ -8,7 +8,8 @@
 class ParticipantForm(forms.ModelForm):
   class Meta:
     model = Participant
-    
+
+
 class LoginForm(forms.Form):
 	username = forms.CharField(max_length=30, label=_(u'username'))
 
diff -r 4976650293f4 -r f0b5ff862c6d conference/models.py
--- a/conference/models.py	Fri Sep 25 00:55:37 2009 +0530
+++ b/conference/models.py	Fri Sep 25 23:54:25 2009 +0530
@@ -1,6 +1,7 @@
 from datetime import datetime
 
-from django.contrib.auth.models import User, UserManager
+from django.contrib.auth.models import User
+from django.contrib.auth.models import UserManager
 from django.db import models
 from django.forms import ModelForm
 from django.utils.translation import ugettext_lazy as _
@@ -10,6 +11,9 @@
   """Model for holding details of participants
   """
 
+  # This is the only required field
+  user = models.ForeignKey(User, unique=True)
+
   PARTICIPANT_CATEGORY = (
        ('Student','Student'),
        ('Corporate Staff','Corporate Staff'),
@@ -17,18 +21,15 @@
        ('Others','Others'),
 	   )
 
-  username = models.ForeignKey(User, unique=True, related_name='profile')
+  category = models.CharField(max_length=80, choices=PARTICIPANT_CATEGORY)
 
-  email    = models.EmailField(_("Email Address"),unique=True)
- 
-  category = models.CharField(max_length = 80, choices=PARTICIPANT_CATEGORY,)
-
-  organisation = models.CharField(_("Organisation"),max_length=200,blank = True,null = True)
+  organisation = models.CharField(_("Organisation"), max_length=200,
+                                  blank = True, null=True)
 
-  attending_conf = models.BooleanField(verbose_name="Will you attend conference?")
+  attending_conf = models.BooleanField(verbose_name="Will you attend the conference?")
 
-  attending_tut = models.BooleanField(verbose_name="Will you attend tutorial session?")
+  attending_tut = models.BooleanField(verbose_name="Will you attend the tutorial session?")
 
-  attending_sprint = models.BooleanField(verbose_name="Will you attend sprint?")
+  attending_sprint = models.BooleanField(verbose_name="Will you attend the sprint?")
 
-  paper_submission = models.BooleanField(verbose_name="Do you want to Submit paper?")
+  paper_submission = models.BooleanField(verbose_name="Do you want to Submit paper(s)?")
diff -r 4976650293f4 -r f0b5ff862c6d conference/tests.py
diff -r 4976650293f4 -r f0b5ff862c6d conference/views.py
diff -r 4976650293f4 -r f0b5ff862c6d images/img01.jpg
diff -r 4976650293f4 -r f0b5ff862c6d images/img02.jpg
diff -r 4976650293f4 -r f0b5ff862c6d images/img03.jpg
diff -r 4976650293f4 -r f0b5ff862c6d images/img04.jpg
diff -r 4976650293f4 -r f0b5ff862c6d images/img05.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img06.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img07.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img08.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img09.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img10.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img11.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img12.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img13.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img14.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img15.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img16.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img17.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img18.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img19.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/img20.gif
diff -r 4976650293f4 -r f0b5ff862c6d images/spacer.gif
diff -r 4976650293f4 -r f0b5ff862c6d license.txt
diff -r 4976650293f4 -r f0b5ff862c6d manage.py
diff -r 4976650293f4 -r f0b5ff862c6d settings.py
--- a/settings.py	Fri Sep 25 00:55:37 2009 +0530
+++ b/settings.py	Fri Sep 25 23:54:25 2009 +0530
@@ -55,6 +55,8 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '(ob412sq1npyyuvfi*b@eby$ip=1rfl*l*b%8f4&l@)3iu$&4#'
 
+AUTH_PROFILE_MODULE = 'conference.participant'
+
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
@@ -83,4 +85,7 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'scipy.conference',
+    'registration',
 )
+
+ACCOUNT_ACTIVATION_DAYS = 0
diff -r 4976650293f4 -r f0b5ff862c6d site-content/default.css
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img01.jpg
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img02.jpg
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img03.jpg
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img04.jpg
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img05.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img06.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img07.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img08.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img09.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img10.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img11.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img12.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img13.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img14.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img15.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img16.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img17.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img18.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img19.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/img20.gif
diff -r 4976650293f4 -r f0b5ff862c6d site-content/images/spacer.gif
diff -r 4976650293f4 -r f0b5ff862c6d template/homepage.html
diff -r 4976650293f4 -r f0b5ff862c6d template/index.html
--- a/template/index.html	Fri Sep 25 00:55:37 2009 +0530
+++ b/template/index.html	Fri Sep 25 23:54:25 2009 +0530
@@ -79,12 +79,13 @@
 <!-- start footer -->
 <div id="footer">
 	<p class="links">
-		<a href="http://validator.w3.org/check/referer" class="xhtml" title="This page validates as XHTML">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a>
+<!--		<a href="http://validator.w3.org/check/referer" class="xhtml" title="This page validates as XHTML">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a>
 		&nbsp;&nbsp;&nbsp;
 		<a href="http://jigsaw.w3.org/css-validator/check/referer" class="css" title="This page validates as CSS">Valid <abbr title="Cascading Style Sheets">CSS</abbr></a>
+		-->
 	</p>
 	<p class="legal">
-		&copy;2007 Concrete. All Rights Reserved.
+		&copy;2009 FOSSEE Group. All Rights Reserved.
 		&nbsp;&nbsp;&bull;&nbsp;&nbsp;
 		Design by <a href="http://www.freecsstemplates.org/">Free CSS Templates</a>
 		&nbsp;&nbsp;&bull;&nbsp;&nbsp;
diff -r 4976650293f4 -r f0b5ff862c6d template/regthank.html
diff -r 4976650293f4 -r f0b5ff862c6d urls.py
--- a/urls.py	Fri Sep 25 00:55:37 2009 +0530
+++ b/urls.py	Fri Sep 25 23:54:25 2009 +0530
@@ -19,6 +19,7 @@
     # Uncomment the next line to enable the admin:
     # (r'^admin/', include(admin.site.urls)),
     url (r'^$', direct_to_template, {"template": "homepage.html"}, name="home"),
+    (r'^accounts/', include('registration.urls')),
     (r'^register/','conference.views.register'),
     (r'^logout/','conference.views.logout'),
     (r'^regthank/(?P<id>\d+)/$', 'conference.views.regthank'),