Merging heads
authorAmit Sethi
Thu, 18 Nov 2010 01:29:38 +0530
changeset 238 0149f28a4f74
parent 237 4cff1f43e4e1 (current diff)
parent 233 394576ff8a2f (diff)
child 239 1973bf1a0a5d
child 241 159880292f66
Merging heads
project/scipycon/registration/models.py
project/scipycon/registration/views.py
project/static/img/scipy-poster.png
project/urls.py
--- a/project/scipycon/registration/forms.py	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/scipycon/registration/forms.py	Thu Nov 18 01:29:38 2010 +0530
@@ -3,6 +3,7 @@
 
 from project.scipycon.registration.models import SIZE_CHOICES
 from project.scipycon.registration.models import OCCUPATION_CHOICES
+from project.scipycon.registration.models import Accommodation
 from project.scipycon.registration.models import Wifi
 
 
@@ -78,6 +79,54 @@
         model = Wifi
         fields = ('wifi',)
 
+
+class AccommodationForm(forms.ModelForm):
+    """PyCon Accommodation form
+    """
+
+    def save(self, user, scope):
+        try:
+            acco = Accommodation.objects.get(user=user, scope=scope)
+        except ObjectDoesNotExist:
+            acco = Accommodation(user=user, scope=scope)
+
+        sex = self.cleaned_data['sex']
+        accommodation_required = self.cleaned_data['accommodation_required']
+        accommodation_days = self.cleaned_data['accommodation_days']
+
+        acco.sex = sex
+        acco.accommodation_required = accommodation_required
+        acco.accommodation_days = accommodation_days if (
+            accommodation_days) else 0
+
+        acco.save()
+
+        return acco
+
+    def clean(self):
+        """Makes sure that accommodation form is correct, i.e. sex
+        and number of days required are filled in when the accommodation
+        is required.
+        """
+        cleaned = self.cleaned_data
+
+        sex = self.cleaned_data['sex']
+        accommodation_required = self.cleaned_data['accommodation_required']
+        accommodation_days = self.cleaned_data['accommodation_days']
+
+        if accommodation_required and (not sex or not accommodation_days
+            or accommodation_days == 0):
+            raise forms.ValidationError(
+                u"If accommodation is required both gender and number of "
+                "days for which accommodation is required is mandatory.")
+
+        return super(AccommodationForm, self).clean()
+
+    class Meta:
+        model = Accommodation
+        fields = ('accommodation_required', 'sex', 'accommodation_days')
+
+
 PC = (
         ('all', 'all'),
         ('paid', 'paid'),
--- a/project/scipycon/registration/models.py	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/scipycon/registration/models.py	Thu Nov 18 01:29:38 2010 +0530
@@ -25,6 +25,10 @@
     ('Other', 'Other')
     )
 
+SEX_CHOICES = (
+    ('Male', 'Male'),
+    ('Female', 'Female'),
+    )
 
 class Wifi(base_models.ScopedBase):
     """Defines wifi options at SciPy.in
@@ -36,6 +40,27 @@
                             help_text=WIFI_HELP, verbose_name="Laptop")
 
 
+class Accommodation(base_models.ScopedBase):
+    """Defines accommodation information for SciPy.in
+    """
+
+    user = models.ForeignKey(User)
+
+    sex = models.CharField(max_length=50, choices=SEX_CHOICES,
+                           verbose_name="Gender",
+                           blank=True, null=True)
+
+    accommodation_required = models.BooleanField(
+        default=False, blank=True,
+        verbose_name="Accommodation required",
+        help_text="Check if you need accommodation.")
+
+    accommodation_days = models.IntegerField(
+        default=0, blank=True,
+        verbose_name="Number of days",
+        help_text="Number of days the accommodation is required for?")
+
+
 class Registration(base_models.ScopedBase):
     """Defines registration at SciPy.in"""
 
@@ -80,6 +105,4 @@
             self.registrant.last_name, self.registrant.email)
 
 
-class Payment(base_models.ScopedBase):
-    """ Defines Payment Details of Users """
-    pass
+
--- a/project/scipycon/registration/views.py	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/scipycon/registration/views.py	Thu Nov 18 01:29:38 2010 +0530
@@ -11,7 +11,9 @@
 from project.scipycon.base.models import Event
 from project.scipycon.registration.forms import RegistrationEditForm
 from project.scipycon.registration.forms import RegistrationSubmitForm
+from project.scipycon.registration.forms import AccommodationForm
 from project.scipycon.registration.forms import WifiForm
+from project.scipycon.registration.models import Accommodation
 from project.scipycon.registration.models import Registration
 from project.scipycon.registration.models import Wifi
 from project.scipycon.registration.utils import send_confirmation
@@ -52,9 +54,17 @@
     """Allows users that submitted a registration to edit it.
     """
 
-    reg = Registration.objects.get(pk=id)
+    scope_entity = Event.objects.get(scope=scope)
+
+    reg = Registration.objects.get(pk=int(id))
     wifi = Wifi.objects.get(user=reg.registrant)
 
+    # TODO: This is an ugly hack to add accommodation form
+    # details at later stage for SciPy.in 2010. This must be
+    # removed for SciPy.in 2011
+    acco, created = Accommodation.objects.get_or_create(user=reg.registrant,
+                                                        scope=scope_entity)
+
     if reg.registrant != request.user:
         redirect_to = reverse('scipycon_account', kwargs={'scope': scope})
 
@@ -66,8 +76,10 @@
     if request.method == 'POST':
         registration_form = RegistrationEditForm(data=request.POST)
         wifi_form = WifiForm(data=request.POST)
+        acco_form = AccommodationForm(data=request.POST)
 
-        if registration_form.is_valid() and wifi_form.is_valid():
+        if (registration_form.is_valid() and wifi_form.is_valid() and
+            acco_form.is_valid()):
             reg.organisation = registration_form.data.get('organisation')
             reg.occupation = registration_form.data.get('occupation')
             reg.city = registration_form.data.get('city')
@@ -85,16 +97,13 @@
             reg.save()
 
             wifi = wifi_form.save(reg.registrant, reg.scope)
+            acco = acco_form.save(reg.registrant, reg.scope)
 
             # Saved.. redirect
             redirect_to = reverse('scipycon_account', kwargs={'scope': scope})
 
             return set_message_cookie(redirect_to,
                 msg = u'Your changes have been saved.')
-        else:
-            import logging
-            logging.error(registration_form.data)
-            raise "Bow Bow"
     else:
         registration_form = RegistrationEditForm(initial={
             'id' : id,
@@ -114,13 +123,21 @@
             'scope': wifi.scope,
             'wifi': wifi.wifi
             })
+        acco_form = AccommodationForm(initial={
+            'user': acco.user,
+            'scope': acco.scope,
+            'sex': acco.sex,
+            'accommodation_required': acco.accommodation_required,
+            'accommodation_days': acco.accommodation_days,
+            })
 
     return render_to_response(
         template_name, RequestContext(request, {
         'params': {'scope': scope},
         'registration': {'id': id},
         'registration_form': registration_form,
-        'wifi_form': wifi_form}))
+        'wifi_form': wifi_form,
+        'acco_form': acco_form}))
 
 def submit_registration(request, scope,
         template_name='registration/submit-registration.html'):
@@ -157,6 +174,7 @@
         registration_form = RegistrationSubmitForm(data=request.POST)
         registrant_form = RegistrantForm(data=request.POST)
         wifi_form = WifiForm(data=request.POST)
+        acco_form = AccommodationForm(data=request.POST)
 
         if request.POST.get('action', None) == 'login':
             login_form = AuthenticationForm(data=request.POST)
@@ -191,7 +209,8 @@
         else:
             newuser = user
 
-        if registration_form.is_valid() and newuser and wifi_form.is_valid():
+        if (registration_form.is_valid() and newuser and wifi_form.is_valid()
+            and acco_form.is_valid()):
             allow_contact = registration_form.cleaned_data.get(
                 'allow_contact') and True or False
             conference = registration_form.cleaned_data.get(
@@ -226,9 +245,8 @@
             reg.save()
 
             wifi = wifi_form.save(registrant, scope_entity)
-
-            # send_confirmation(registrant, scope_entity,password=passwd)
-
+            acco = acco_form.save(registrant, scope_entity)
+            send_confirmation(registrant, scope_entity, password=passwd)
             redirect_to = reverse('scipycon_registrations',
                                   kwargs={'scope': scope})
             return set_message_cookie(redirect_to,
@@ -239,6 +257,7 @@
         registration_form = RegistrationSubmitForm()
         registrant_form = RegistrantForm()
         wifi_form = WifiForm()
+        acco_form = AccommodationForm()
 
     login_form = AuthenticationForm()
 
@@ -248,6 +267,7 @@
         'registration_form': registration_form,
         'registrant_form' : registrant_form,
         'over_reg' : reg_count >= REG_TOTAL and True or False,
+        'acco_form': acco_form,
         'wifi_form' : wifi_form,
         'message' : message,
         'login_form' : login_form
--- a/project/scipycon/talk/forms.py	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/scipycon/talk/forms.py	Thu Nov 18 01:29:38 2010 +0530
@@ -47,7 +47,7 @@
         required=False,
         widget=forms.TextInput(attrs={'size':'50'}))
     duration = forms.ChoiceField(choices=DURATION_CHOICES, required=True,
-        label=u'Preferred timeslot', help_text=u'Select preferred time slot')
+        label=u'Preferred time slot', help_text=u'Select preferred time slot')
     audience = forms.ChoiceField(choices=AUDIENCE_CHOICES, label=u'Intended audience',
         help_text=u'Select one of the available options or enter other type of intended audience')
 #    audience_other = forms.CharField(label=u'Other intended audience',
Binary file project/static/img/perry.jpg has changed
Binary file project/static/img/qutubshahi.jpg has changed
Binary file project/static/img/scipy-poster-A3.png has changed
Binary file project/static/img/scipy-poster-A4.png has changed
Binary file project/static/img/scipy-poster.png has changed
Binary file project/static/img/stefan.jpg has changed
--- a/project/templates/_menu.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/_menu.html	Thu Nov 18 01:29:38 2010 +0530
@@ -10,14 +10,19 @@
       </ul>
     </li>
     <li>
-      Talks & CfP
+      Conference & CfP
       <ul>
         <li>
           <a href="/{{ params.scope }}/talks-cfp/">Call for Papers</a>
         </li>
         <li>
           <a href="/{{ params.scope }}/talks-cfp/schedule/">
-            Conference Schedule
+            Schedule
+          </a>
+        </li>
+	<li>
+          <a href="/{{ params.scope }}/talks-cfp/conference/">
+            Conference
           </a>
         </li>
         <!--
@@ -44,6 +49,21 @@
       </ul>
     </li>
     <li>
+      <a href="/{{ params.scope }}/tutorial/">
+      Tutorials
+      </a>
+    </li>
+    <li>
+      <a href="/{{ params.scope }}/sprints/">
+      Sprints
+      </a>
+    </li>
+    <li>
+      <a href="/{{ params.scope }}/certificates/">
+      Certificates
+      </a>
+    </li>
+    <li>
       About
       <ul>
         <!--
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/templates/about/certificates.html	Thu Nov 18 01:29:38 2010 +0530
@@ -0,0 +1,102 @@
+{% extends "base.html" %}
+{% block content %}
+<h1 class="title">Certificates</h1>
+
+
+<h3 id="sec-1">Certificate of Appreciation </h3>
+
+<h4 id="sec-1_1">Participants </h4>
+
+<ul>
+<li>
+A <i>Certificate of Appreciation</i> will be issued for
+participants and presenters who contribute considerably during
+the sprints.
+</li>
+<li>
+To be considered for the <i>Certificate of Appreciation</i>, the
+sprint lead has to approve the participant, based on the proof
+of contribution in sprints.
+</li>
+</ul>
+
+<h4 id="sec-1_2">Conference Presenters </h4>
+
+<ul>
+<li>
+A separate <i>Certificate of Appreciation</i> will be given to all
+conference presenters (including those giving Lightning
+Talks). Conference presenters will be selected based on the
+abstracts submitted on the website.
+
+</li>
+</ul>
+
+<h3 id="sec-2">T-Shirts </h3>
+
+<h4 id="sec-2_1">Participants &amp; Speakers </h4>
+
+<ul>
+<li>
+T-shirts are given to all participants who contribute significantly
+in the sprints, invited speakers and conference presenters.
+</li>
+<li>
+The sprint lead has to recommend/approve contributors for a t-shirt.
+</li>
+<li>
+Only one t-shirt per participant will be given.
+
+</li>
+</ul>
+
+<h3 id="sec-3">Certificate of Participation </h3>
+
+<h4 id="sec-3_1">Participants </h4>
+
+<ul>
+<li>
+Participants simply attending the conference talks, tutorials, and sprints, will not be given 
+any certificates. They will, however, be given receipts for the payment made, which can be 
+submitted to their respective institutions/organizations.
+
+</li>
+</ul>
+
+<h3 id="sec-4">Other goodies </h3>
+
+<h4 id="sec-4_1">Participants &amp; Presenters </h4>
+
+<ul>
+<li>
+Rewards/swag will be given to participants who perform exceptionally
+well in the sprints.
+</li>
+<li>
+The sprint lead has to recommend contributors for these rewards.
+</li>
+<li>
+Some rewards  may be sent by post/courier to participants after
+the event.
+
+</li>
+</ul>
+
+<h3 id="sec-5">Note </h3>
+
+<ul>
+<li>
+Please do not contact SciPy.in organizers for a <i>Certificate of      Participation</i> as mere participation/sitting through the event
+does not entitle a participant/registrant for a certificate of
+participation or appreciation.
+</li>
+<li>
+Participants will be eligible only for a <b>Receipt</b> for the amount
+paid towards registration and accommodation.
+</li>
+<li>
+The decision of the sprint leads and the FOSSEE team would be final and binding.
+</li>
+</ul>
+
+{% endblock content %}
--- a/project/templates/about/city.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/about/city.html	Thu Nov 18 01:29:38 2010 +0530
@@ -3,27 +3,23 @@
 <h1>Hyderabad - Host City</h1>
 
 <div class="entry">
-<p>Capital of the state of Andhra Pradesh, Hyderabad is the fifth largest city in India and has its own
-distinct culture. Secunderabad is a twin city of Hyderabad and is separated by the Hussain Sagar,
-an artificial lake constructed in 1562 A.D. The city is nearly 400 years old and is noted for its
-natural beauty, mosques and minarets, bazaars and bridges, hills and lakes. It is perched on the
-top of the Deccan Plateau, 1776 ft. above sea level, and sprawls over an area of 100 Sq. miles.
+<p>Hyderabad is the capital of the state of Andhra Pradesh, and is the fifth largest city in India. Secunderabad is a twin city of Hyderabad and is separated by the Hussain Sagar (locally well known as <i>Tank Bund</i>), an artificial lake constructed in 1562 A.D. The city is nearly 400 years old and is noted for its natural beauty, mosques and minarets, bazaars and bridges, hills and lakes. It is perched on the top of the Deccan Plateau, 1776 ft. above sea level, and sprawls over an area of 100 Sq. miles. Hyderabad is famous for its architecture, cuisine, pickles, and pearls. It is considered to be at cross-roads between the North and the South,the historical and the modern. The <i>Islamic</i> influences of the <i>Nawabs</i> are visible even today in the cuisine and architecture, especially in the older sections of the city, while expanding suburbs are very cosmopolitan.
 </p>
 
-<p>A multitude of influences have shaped the character of the city. Its palaces and buildings, houses
-and tenements, gardens and streets have a history and an architectural individuality of their
-own, which makes Hyderabad a city of enchantment. Hyderabad is also known as Cyberabad,
-owing to the presence of large number of IT companies. All major IT companies from across the
-globe have marked their presence in Hyderabad by having their offices, development centers or
-research centers located there.</p>
+<p>A multitude of influences have shaped the character of the city and it has a distinct culture. Its palaces and buildings, houses and tenements, gardens and streets have a history and an architectural individuality of their own, which make Hyderabad a city steeped in culture. Hyderabad is also known as Cyberabad, owing to the presence of large number of IT companies. All major IT companies from across the globe have marked their presence in Hyderabad by having their offices, development centers, or research centers located there.</p>
+
+<p> When in Hyderabad, shopping for pearls is a must - <i>City of Pearls</i> is one of the many <i>sobriquets</i> of Hyderabad . Another <i>must try</i> in Hyderabad is the <i>biriyani</i>, a flavorful and fragrant rice dish. <i>Pulla Reddy</i> and <i>Rami Reddy</i> are famous sweet vendors which are worth checking out. A visit to the Charminar and the surrounding maze of markets is an experience of a lifetime. Be sure to bargain for clothes, ethnic accessories, jewellery (especially pearls and bangles), and artefacts from the myriad vendors abounding these <i>bazaars</i>. Some advice to keep in mind while bargaining would be to start at a fourth (or less) of the price quoted, although this may not always apply.</p>
+
+<p>While <i>Telugu</i> is the state language, a knowledge of <i>Urdu</i>, <i>Hindi</i>, or <i>English</i>, is sufficient to get by, in many places within the city. For more information, including transportation details, do check <a href="http://wikitravel.org/en/Hyderabad">the WikiTravel entry on Hyderabad</a>. </p>
+
+<p> 
 
 <h3>Map</h3>
 
 <p>A Google Map of Hyderabad with prominent places marked can be found here</p>
-
-<a href="http://maps.google.com/maps/ms?hl=en&ie=UTF8&msa=0&msid=116571751012231655985.00045ea3a3aa0272ecec3&ll=17.452566,78.373847&spn=0.013694,0.015235&z=16">
-http://maps.google.com/maps/ms?hl=en&ie=UTF8&msa=0&msid=116571751012231655985.00045ea3a3aa0272ecec3&ll=17.452566,78.373847&spn=0.013694,0.015235&z=16</a>
-
+<p>
+<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps/ms?hl=en&amp;ie=UTF8&amp;msa=0&amp;msid=116571751012231655985.00045ea3a3aa0272ecec3&amp;ll=17.452566,78.373847&amp;spn=0.014329,0.018239&amp;z=15&amp;output=embed"></iframe><br /><small>View <a href="http://maps.google.com/maps/ms?hl=en&amp;ie=UTF8&amp;msa=0&amp;msid=116571751012231655985.00045ea3a3aa0272ecec3&amp;ll=17.452566,78.373847&amp;spn=0.014329,0.018239&amp;z=15&amp;source=embed" style="color:#0000FF;text-align:left">miyapur to Kompalli </a> in a larger map</small>
+</p>
 <h3>Climate, Weather and Local time</h3>
 
 <ul>
@@ -36,51 +32,27 @@
 <h2>Famous Historical Sites</h2>
 
 <div id="speaker"><div id="speakerphoto"><img src="/static/img/golconda.jpg" alt="Golconda Fort" title="Golconda Fort" /></div>
-<div id="speakerinfo">Golconda fort was founded originally by the Kakatiyas in the 13th
-century, and was expanded by the Qutb Shahi kings into a massive fort of granite with walls. The
-fortress city within the walls was famous for the diamond trade and the Koh-i-noor diamond is
-said to have come from here. One of the most remarkable features of Golconda is its system of
-acoustics. The sounds of hands clapped in the grand portico can be heard in the Durbar Hall, at
-the very top of the hill.</div><br /></div>
+<div id="speakerinfo">The Golconda fort was founded originally by the <i>Kakatiyas</i> in the 13th century, and was expanded by the Qutb Shahi kings into a massive fort of granite with walls. The fortress city within the walls was famous for the diamond trade and the <i>Koh-i-noor</i> diamond is said to have come from here. One of the most remarkable features of the Golconda fort is its system of
+acoustics. The sounds of hands clapped in the grand portico can be heard in the Durbar Hall, at the very top of the hill.</div><br /></div>
 
 <div id="speaker"><div id="speakerphoto"><img src="/static/img/charminar.jpg" alt="Charminar" title="Charminar" /></div>
-<div id="speakerinfo">Charminar is the major landmark in Hyderabad, the massive arch built
-by Mohammed Quli Qutab Shah, in 1591 looming at a height of 56 m, is an impressive square
-gateway with four minarets, to commemorate the end of the plague. The arch is illuminated daily
-in the evening, an unforgettable sight indeed.</div><br /><br /><br /><br /></div>
+<div id="speakerinfo">The <i>Charminar</i> (literally, "Four Minarets")is a major landmark in Hyderabad, the massive arch built by Mohammed Quli Qutab Shah, in 1591 looming at a height of 56 m, is an impressive square gateway with four minarets, to commemorate the end of the plague. The arch is illuminated daily in the evening, and is an unforgettable sight.</div><br /><br /><br /><br /></div>
 
 <div id="speaker"><div id="speakerphoto"><img src="/static/img/meccamasjid.jpg" alt="Mecca Masjid" title="Mecca Masjid" /></div>
-<div id="speakerinfo">Mecca Masjid is near Charminar, one of the largest in the state if not in
-India, said to accomodate upto 10,000 worshippers. Muhammed Quli Qutub Shah began building
-it in 1617 and was completed during the reign of Mughal emperor Aurangzeb in 1694.</div><br /><br /><br /><br /></div>
+<div id="speakerinfo">The <i>Mecca Masjid</i>, near the <i>Charminar</i>, is one of the largest in the state if not in
+India. It is said to accomodate upto 10,000 worshippers. Muhammed Quli Qutub Shah began building it in 1617 and was completed during the reign of Mughal emperor Aurangzeb in 1694.</div><br /><br /><br /><br /></div>
 
-<div id="speaker"><div id="speakerphoto"><img src="/static/img/golconda.jpg" alt="Golconda Fort" title="Golconda Fort" /></div>
-<div id="speakerinfo">A little away from Golconda fort are a cluster of tombs. Most of them
-have intricately carved stonework and are the most authentic evidence of the Qutub Shahi
-architectural traditions. The tombs erected in the memory of the departed kings of Golconda.
-They stand a kilometer north of Golconda fort's Banjara Darwaza.</div><br /><br /><br /><br /></div>
+<div id="speaker"><div id="speakerphoto"><img src="/static/img/qutubshahi.jpg" alt="Qutub Shahi Tombs" width="160px" title="Qutub Shahi Tombs" /></div>
+<div id="speakerinfo">A little away from the Golconda fort is a cluster of tombs. Most of them have intricately carved stonework and are the most authentic evidence of the Qutub Shahi architectural traditions. The tombs were erected in the memory of the departed kings of Golconda. They stand a kilometer north of Golconda fort's Banjara Darwaza.</div><br /><br /><br /><br /></div>
 
 <div id="speaker"><div id="speakerphoto"><img src="/static/img/hussainsagar.jpg" alt="Hussain Sagar Lake" title="Hussain Sagar Lake" /></div>
-<div id="speakerinfo">Hussain Sagar is a lake in Hyderabad, India built by Hazrat Hussain
-Shah Wali in 1562, during the rule of Ibrahim Quli Qutb Shah. It was a lake of 24 kilometres
-built on a tributary of the River Musi to meet the water and irrigation needs of the city. There is
-a large monolithic statue of the Gautam Buddha in the middle of the lake which was erected in
-1992.</div><br /><br /><br /><br /></div>
+<div id="speakerinfo">The <i>Hussain Sagar</i> is a lake in Hyderabad, built by Hazrat Hussain Shah Wali in 1562, during the rule of Ibrahim Quli Qutb Shah. It is a 24 km long lake built on a tributary of the River Musi to meet the water and irrigation needs of the city. There is a large monolithic statue of the Gautam Buddha in the middle of the lake which was erected in 1992. It is also called <i>Tank Bund</i> in local parlance.</div><br /><br /><br /><br /></div>
 
 <div id="speaker"><div id="speakerphoto"><img src="/static/img/birlamandir.jpg" alt="Birla Mandir" title="Birla Mandir" /></div>
-<div id="speakerinfo">Birla Mandir is a magnificient temple built entirely in marble, with
-great architectural significance. It was built by the Birla Foundation. The temple is dedicated to
-Lord Venkateshwara. The granite image of the presiding deity is about 11 ft. tall and a carved
-lotus forms an umbrella on the roof. The consorts of Lord Venkateswara, 'Padmavati' and 'Andal'
-are housed in separate shrines. There is a brass flagstaff in the temple premises which rises to a
-height of 42 ft. The temple manifests a blend of South Indian, Rajasthani and Utkal temple
-architectures. In its entirety, it is made of 2000 tons of pure Rajasthani white marble. It is built on
-a 280-feet high hillock called the Naovath Pahad in a 13 acres plot. The construction of the
-temple took 10 years and it was consecrated in 1976. The temple complex overlooking the
-southern side of Hussain Sagar, offers a magnificient panoramic view of the twin cities of
-Hyderabad and Secunderabad. It presents a colorful spectacular sight when illuminated at night.</div><br /></div>
+<div id="speakerinfo">Birla Mandir is a magnificient temple built entirely in marble, with great architectural significance. It was built by the Birla Foundation. The temple is dedicated to Lord Venkateshwara. The granite image of the presiding deity is about 11 ft. tall and a carved lotus forms an umbrella on the roof. The consorts of Lord Venkateswara, 'Padmavati' and 'Andal' are housed in separate shrines. There is a brass flagstaff in the temple premises which rises to a
+height of 42 ft. The temple manifests a blend of South Indian, Rajasthani and Utkal temple architectures. In its entirety, it is made of 2000 tons of pure Rajasthani white marble. It is built on a 280-feet high hillock called the Naovath Pahad in a 13 acres plot. The construction of the temple took 10 years and it was consecrated in 1976. The temple complex overlooking the southern side of Hussain Sagar, offers a magnificient panoramic view of the twin cities of Hyderabad and Secunderabad. It presents a colorful spectacular sight when illuminated at night.</div><br /></div>
 
-<p>The following websites will be helpful to find more information about Hyderabad</p>
+<p>The following websites can help find more information about Hyderabad.</p>
 
 <ul>
   <li><a href="http://www.aptourism.in/hplaces.html">http://www.aptourism.in/hplaces.html</a></li>
@@ -89,4 +61,4 @@
   <li><a href="http://www.fullhyderabad.com/">http://www.fullhyderabad.com/</a></li>
   </ul>
 </div>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
--- a/project/templates/about/organizers.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/about/organizers.html	Thu Nov 18 01:29:38 2010 +0530
@@ -103,14 +103,10 @@
 Venkatesh Choppella
 </li>
 <li>
-Sunanda Varma
+General R K Bagga
 </li>
 <li>
-Vamsi Pullakavi
-</li>
-<li>
-General R K Bagga
-
+Enhance Edu Team, IIIT Hyderabad
 </li>
 </ul>
 
--- a/project/templates/about/publicity.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/about/publicity.html	Thu Nov 18 01:29:38 2010 +0530
@@ -5,7 +5,7 @@
 <div class="entry">
 <h2>Poster</h2>
 <p>
-<a href="/static/img/scipy-poster.png">Download Poster</a>
+Download Poster (<a href="/static/img/scipy-poster-A3.png">A3 (3.6M)</a> | <a href="/static/img/scipy-poster-A4.png">A4 (1.7M)</a>)
 </p>
 </div>
 {% endblock content %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/templates/about/sprints.html	Thu Nov 18 01:29:38 2010 +0530
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>Probable Sprint Topics</h1>
+
+<ul>
+<li>
+Documentation
+<ul>
+<li>
+Scipy/Numpy
+</li>
+<li>
+Mayavi
+</li>
+</ul>
+</li>
+<li>
+Mayavi
+</li>
+<li>
+Ipython
+</li>
+<li>
+Sage
+</li>
+<li>
+matplotlib
+</li>
+<li>
+Spoken tutorial
+<ul>
+<li>
+recording
+</li>
+<li>
+dubbing
+</li>
+</ul>
+</li>
+<li>
+Text books
+<ul>
+<li>
+Kreyszig - Advanced Engineering Mathematics 
+</li>
+<li>
+Strang - Linear Algebra
+</li>
+<li>
+Introduction to Dynamics - Ian Percival, Derek Richards
+
+</li>
+</ul>
+</li>
+</ul>
+
+<p>Details of the Sprints can be worked out based on the interest of
+the participants.  This will be updated as soon as more information is 
+available.
+</p>
+<p>
+Participants of Sprints who make a significant contribution will be
+given swag. The sprint lead, will choose the participants who are
+eligible for the swag. 
+</p>
+
+{% endblock content %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/templates/about/tutorial.html	Thu Nov 18 01:29:38 2010 +0530
@@ -0,0 +1,174 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>Tutorials</h1>
+
+<h3 id="sec-1"><span class="section-number-3"></span>Intended audience </h3>
+
+<p>This conference is targeted at anyone who uses Python for work in science/engineering/technology/education. This includes college and university teachers/professors/lecturers from any Engineering or Science domain, students of engineering/science/education who would like to use Python for their basic computing and plotting needs, researchers who use or would like to use Python for their research, and corporate users of Python for scientific computing.
+</p>
+
+<h3 id="sec-2"><span class="section-number-3"></span>Prerequisites </h3>
+
+<ul>
+<li>
+Participants should be comfortable computer users and be familiar with programming constructs such as loops, conditionals.
+</li>
+<li>
+Familiarity with programming editors&ndash; scite, notepad++, vi, emacs- will be a plus.
+</li>
+<li>
+Familiarity with using the commandline will be another plus.
+
+</li>
+</ul>
+
+<h3 id="sec-3"><span class="section-number-3"></span>Objectives </h3>
+
+<ul>
+<li>
+At the end of the program the participants will have a good understanding of the Python language, and selected libraries.
+</li>
+<li>
+They will be able to write good modular procedural code and use objects.
+</li>
+<li>
+They will get a overview of the other major topics, features and libraries and be able to learn these on their own if required.
+</li>
+<li>
+They will be able to generate 2-D plots using NumPy and Matplotlib, and 3-D plots using MayaVi2.
+</li>
+<li>
+They will be able to incorporate and adapt Python in their lessons
+
+</li>
+</ul>
+
+<h3 id="sec-4"><span class="section-number-3"></span>Coverage </h3>
+
+<p>This is a rough outline of the topics to be covered in the
+tutorials. The exact schedule of the tutorials will be put up in a
+short while.
+</p>
+<ul>
+<li>
+<a href="http://www.sagemath.org" >Sage</a> 
+<ul>
+<li>
+basic usage 
+</li>
+<li>
+symbolic computing
+</li>
+<li>
+numeric computing
+</li>
+<li>
+basic plotting
+</li>
+</ul>
+</li>
+<li>
+Basic Scientific Computing with Python covering the following
+<ul>
+<li>
+ipython
+</li>
+<li>
+pylab
+</li>
+<li>
+numpy
+</li>
+<li>
+scipy
+</li>
+<li>
+basic use of Mayavi
+</li>
+</ul>
+</li>
+<li>
+Basic Python
+<ul>
+<li>
+data-types
+</li>
+<li>
+conditionals &amp; looping
+</li>
+<li>
+functions &amp; modules
+</li>
+</ul>
+</li>
+<li>
+Advanced topics
+<ul>
+<li>
+Cython
+</li>
+<li>
+More Ipython
+</li>
+<li>
+More Mayavi
+</li>
+<li>
+More matplotlib
+</li>
+<li>
+More Sage?
+
+</li>
+</ul>
+</li>
+</ul>
+
+<p>Any participants using their own laptops should have the required
+software installed on their machines, before coming to the venue of
+the tutorials. The installation instructions are available <a href="http://fossee.in/installation-how-to">here</a>.
+</p>
+
+
+<h3 id="sec-5"><span class="section-number-3"></span>Methodology </h3>
+
+<ul>
+<li>
+Completely hands on, exploratory mode with minimal lectures introducing essential concepts and techniques.
+</li>
+<li>
+Typically we will have short 15 - 20 minute lectures, followed by series of graduated problems. The participants will solve them exploring the documentation to do so and the solutions will be discussed.
+</li>
+<li>
+We shall be conducting quizzes during the course of the workshop to evaluate the degree to which the objectives have been accomplished.
+
+</li>
+</ul>
+
+<p>Laptops can be brought by participants, and additional laptops/computers can be provided for use for those required. Charging points will be available.
+</p>
+<p>
+As far as installations go, you would require the following:
+</p>
+<ul>
+<li>
+For Debian/ Ubuntu and the like:
+(a) IPython
+(b) Python doc
+(c) the Python Profiler
+(d) Scipy/Numpy
+(e) Matplotlib
+(f) Mayavi2
+
+</li>
+<li>
+For Windows XP (x86), Windows Vista (x86), Mac OS X 10.4+ (x86), RedHat 3 (x86, amd64), RedHat 4 (x86, amd64), RedHat 5 (x86, amd64), and Solaris 10 (x86, amd64) :
+(a) get the EPD (<a href="http://www.enthought.com/products/epd.php">http://www.enthought.com/products/epd.php</a>) bundle and you'll have everything you need! This is available for free for those in academia and others can utilize the free 30 day trial version for now.
+
+</li>
+</ul>
+
+<p>In any case, we will be providing live DVDs containing all the required installations and some additional tools on site. The iso can also be downloaded from the fossee.in site (<a href="http://fossee.in/download#DVDs">http://fossee.in/download#DVDs</a>).
+</p>
+
+{% endblock content %}
--- a/project/templates/about/venue.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/about/venue.html	Thu Nov 18 01:29:38 2010 +0530
@@ -6,10 +6,7 @@
 Technology in Hyderabad, keeping in mind accessibility, the number of attendees
 and the location, among other aspects to be considered.</p>
 
-<p>You can know more the host city - Hyderabad with some interesting pictures
-here <a href="{% url scipycon_city params.scope %}">Host City - Hyderabad</a></p>.
-
 <p>
 <strong>More about IIIT-Hyderabad coming soon.</strong></p>
 </div>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
--- a/project/templates/home.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/home.html	Thu Nov 18 01:29:38 2010 +0530
@@ -26,6 +26,22 @@
 <p>All these features when combined with their wide-ranging applications
 make Python a perfect fit for use in Education, Industry and Scientific
 Computing.</p>
+
+<h1>Why Python?</h1>
+
+<p>
+<video
+  src="http://fossee.in/sitefiles/Videos/why_python_short.ogv"
+  width=50%
+  height=50%
+  controls>
+  Your Browser does not support the video tag, upgrade to Firefox 3.5+
+</video>
+</p>
+<p>
+<a href="http://fossee.in/sitefiles/Videos/why_python_short.ogv">Download video (14 min - short version)</a> | <a href="http://fossee.in/sitefiles/Videos/why_python.ogv">Download video (41 min - long version)</a>
+</p>
+
 <h1>Scope of the conference</h1>
   <p><strong>Scipy.in </strong>is a conference providing opportunities to 
 spread the use of the Python programming language in the Scientific Computing
--- a/project/templates/registration/edit-registration.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/registration/edit-registration.html	Thu Nov 18 01:29:38 2010 +0530
@@ -9,11 +9,11 @@
 {% block overreg %}{% endblock overreg %}
 
 {% block url_select_login %}
-  "{% url scipycon_edit_registration params.scope 1 %}"
+  "{% url scipycon_edit_registration params.scope registration.id %}"
 {% endblock url_select_login %}
 
 {% block url_select_reg %}
-  "{% url scipycon_edit_registration params.scope 1 %}"
+  "{% url scipycon_edit_registration params.scope registration.id %}"
 {% endblock url_select_reg %}
 
 {% block formextras %}
--- a/project/templates/registration/submit-registration.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/registration/submit-registration.html	Thu Nov 18 01:29:38 2010 +0530
@@ -2,6 +2,29 @@
 
 {% block title %}Submit Registration{% endblock %}
 
+{% block addscripts %}
+  <script type="text/javascript">
+
+  $(document).ready(function(){
+    if (!$('#id_accommodation_required').is(':checked')) {
+      $('#id_accommodation_days').attr('disabled', 'disabled');
+      $('#id_sex').attr('disabled', 'disabled');
+    }
+    $('#id_accommodation_required').change(function() {
+      if (!$('#id_accommodation_required').is(':checked')) {
+        $('#id_accommodation_days').attr('disabled', 'disabled');
+        $('#id_sex').attr('disabled', 'disabled');
+      } else {
+        $('#id_accommodation_days').removeAttr('disabled');
+        $('#id_sex').removeAttr('disabled');
+      }
+    });
+  });
+
+
+  </script>
+{% endblock addscripts %}
+
 {% block content %}
     {% block formheading %}
       <h1>Submit Registration</h1>
@@ -117,6 +140,13 @@
       </fieldset>
 
       <fieldset>
+        <legend>Accommodation</legend>
+        <table class="scipycon-default">
+          {{ acco_form }}
+        </table>
+      </fieldset>
+
+      <fieldset>
         <legend>Others</legend>
         <table class="scipycon-default">
           {{ wifi_form }}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/templates/talk/conf_schedule.html	Thu Nov 18 01:29:38 2010 +0530
@@ -0,0 +1,199 @@
+{% extends "base.html" %}
+{% block content %}
+<h1 class="title">SciPy.in 2010 Conference Schedule</h1>
+
+<h3 id="sec-1">A detailed list of talks will be announced after accepting the Call for Papers is complete. The schedule of invited talks given below may change. The final schedule for the conference will be put up after evaluating the submitted talks.</h3>
+
+<h2 id="sec-1">Day 1 </h2>
+
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col align="right" /><col align="left" /><col align="left" /><col align="left" />
+</colgroup>
+<thead>
+<tr><th scope="col">Time</th><th scope="col">Agenda</th><th scope="col">Speaker</th><th scope="col">Title</th></tr>
+</thead>
+<tbody>
+<tr><td>9:00-9:30</td><td>Inauguration</td><td></td><td></td></tr>
+<tr><td>9:30-10:30</td><td>Keynote</td><td>Perry Greenfield</td><td><a href="#sec-3">How Python Slithered into Astronomy</a></td></tr>
+<tr><td>10:30-10:45</td><td>Tea Break</td><td></td><td></td></tr>
+<tr><td>10:45-11:30</td><td>Special Talk 1</td><td>Fernando Perez</td><td><a href="#sec-4">IPython : Beyond the Simple Shell</a></td></tr>
+<tr><td>11:30-12:00</td><td>Invited Talk 1</td><td>Asokan Pichai</td><td><a href="#sec-5">Teaching Programming with Python</a></td></tr>
+<tr><td>12:00-13:15</td><td>Talks</td><td></td><td></td></tr>
+<tr><td>13:15-14:15</td><td>Lunch</td><td></td><td></td></tr>
+<tr><td>14:15-14:45</td><td>Lightning Talks</td><td></td><td></td></tr>
+<tr><td>14:45-15:55</td><td>Talks</td><td></td><td></td></tr>
+<tr><td>15:55-16:10</td><td>Tea Break</td><td></td><td></td></tr>
+<tr><td>16:10-17:30</td><td>Talks</td><td></td><td></td></tr>
+</tbody>
+</table>
+
+<h2 id="sec-2">Day 2 </h2>
+
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col align="right" /><col align="left" /><col align="left" /><col align="left" />
+</colgroup>
+<thead>
+<tr><th scope="col">Time</th><th scope="col">Agenda</th><th scope="col">Speaker</th><th scope="col">Title</th></tr>
+</thead>
+<tbody>
+<tr><td>9:00-10:00</td><td>Special Talk 2</td><td>John Hunter</td><td><a href="#sec-6">matplotlib: Beyond the simple plot</a></td></tr>
+<tr><td>10:00-10:45</td><td>Invited Talk 2</td><td>Prabhu Ramachandran</td><td><a href="#sec-7">Mayavi : Bringing Data to Life</a></td></tr>
+<tr><td>10:45-11:00</td><td>Tea Break</td><td></td><td></td></tr>
+<tr><td>11:00-13:15</td><td>Talks</td><td></td><td></td></tr>
+<tr><td>13:15-14:15</td><td>Lunch</td><td></td><td></td></tr>
+<tr><td>14:15-14:45</td><td>Lightning Talks</td><td></td><td></td></tr>
+<tr><td>14:45-15:55</td><td>Talks</td><td></td><td></td></tr>
+<tr><td>15:55-16:10</td><td>Tea Break</td><td></td><td></td></tr>
+<tr><td>16:10-17:30</td><td>Talks</td><td></td><td></td></tr>
+</tbody>
+</table>
+
+<h2 id="sec-3">Keynote by Perry Greenfield </h2>
+
+<p>Perry Greenfield
+</p>
+
+<h3 id="sec-3_1">Title </h3>
+
+<p>How Python Slithered into Astronomy
+</p>
+
+<h3 id="sec-3_2">Talk/Paper Abstract </h3>
+
+<p>
+I will talk about how Python was used to solve our problems for the
+Hubble Space Telescope. From humble beginnings as a glue element for
+our legacy software, it has become a cornerstone of our scientific
+software for HST and the next large space telescope, the James Webb
+Space Telescope, as well as many other astronomy projects. The talk
+will also cover some of the history of essential elements for
+scientific Python and where future work is needed, and why Python is
+so well suited for scientific software.
+</p>
+
+
+<h2 id="sec-4">Special Talk 1 </h2>
+
+<p>Fernando Perez
+</p>
+
+<h3 id="sec-4_1">Title </h3>
+
+<p>IPython : Beyond the Simple Shell
+</p>
+
+<h3 id="sec-4_2">Talk/Paper Abstract: </h3>
+
+<p>IPython is a widely used system for interactive computing in Python
+that extends the capabilities of the Python shell with operating
+system access, powerful object introspection, customizable "magic"
+commands and many more features.  It also contains a set of tools to
+control parallel computations via high-level interfaces that can be
+used either interactively or in long-running batch mode.
+
+In this talk I will outline some of the main features of IPython as it
+has been widely adopted by the scientific Python user base, and will
+then focus on recent developments.  Using the high performance ZeroMQ
+networking library, we have recently restructured IPython to decouple
+the kernel executing user code from the control interface.  This
+allows us to expose multiple clients with different capabilities,
+including a terminal-based one, a rich Qt client and a web-based one
+with full matplotlib support. In conjunction with the new HTML5
+matplotlib backend, this architecture opens the door for a rich
+web-based environment for interactive, collaborative and parallel
+computing.  
+
+There is much interesting development to be done on this front, and I
+hope to encourage participants at the sprints during the conference to
+join this effort.
+
+</p>
+
+<h2 id="sec-5">Invited Talk 1 </h2>
+
+<p>Asokan Pichai
+</p>
+
+<h3 id="sec-5_1">Title </h3>
+
+<p>Teaching Programming with Python
+</p>
+
+<h3 id="sec-5_2">Talk/Paper Abstract: </h3>
+
+<p>As a trainer I have been engaged a lot for teaching fresh Software
+Engineers and software job aspirants. Before starting on the language,
+platform specific areas I teach a part I refer to as Problem Solving
+and Programming Logic. I have used Python for this portion of training
+in the last 12+years. In this talk I wish to share my experiences and
+approaches.
+
+This talk is intended at Teachers, Trainers, Python Evangelists, and
+HR Managers [if they lose their way and miraculously find themselves in SciPy :-)]
+
+</p>
+
+
+<h2 id="sec-6">Special Talk 2 </h2>
+
+<p>John Hunter
+</p>
+
+<h3 id="sec-6_1">Title </h3>
+
+<p>matplotlib: Beyond the simple plot
+</p>
+
+<h3 id="sec-6_2">Talk/Paper Abstract: </h3>
+
+<p>matplotlib, a python package for making sophisticated publication
+quality 2D graphics, and some 3D, has long supported a wide variety
+of basic plotting types such line graphs, bar charts, images,
+spectral plots, and more.  In this talk, we will look at some of the
+new features and performance enhancements in matplotlib as well as
+some of the comparatively undiscovered features such as interacting
+with your data and graphics, and animating plot elements with the
+new animations API.  We will explore the performance with large
+datasets utilizing the new path simplification algorithm, and
+discuss areas where performance improvements are still needed.
+Finally, we will demonstrate the new HTML5 backend, which in
+combination with the new HTML5 IPython front-end under development,
+will enable an interactive Python shell with interactive graphics in
+a web browser.
+</p>
+
+
+<h2 id="sec-7">Invited Talk 2 </h2>
+
+<p>Prabhu Ramachandran
+</p>
+
+<h3 id="sec-7_1">Title </h3>
+
+<p>Mayavi : Bringing Data to Life
+</p>
+
+<h3 id="sec-7_2">Talk/Paper Abstract: </h3>
+
+<p>Mayavi is a powerful 3D plotting package implemented in Python.  It
+includes both a standalone user interface along with a powerful yet
+simple scripting interface.  The key feature of Mayavi though is that it
+allows a Python user to rapidly visualize data in the form of NumPy
+arrays.  Apart from these basic features, Mayavi has some advanced
+features.  These include, automatic script recording, embedding into a
+custom user dialog and application.  Mayavi can also be run in an
+offscreen mode and be embedded in a sage notebook
+(http://www.sagemath.org).
+
+We will first rapidly demonstrate these key features of Mayavi.  We will
+then discuss some of the underlying technologies like enthought.traits,
+traitsUI and TVTK that form the basis of Mayavi.  The objective of this
+is to demonstrate the wide range of capabilities that both Mayavi and
+its underlying technologies provide the Python programmer.
+
+</p>
+
+
+{% endblock content %}
--- a/project/templates/talk/list-talks.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/talk/list-talks.html	Thu Nov 18 01:29:38 2010 +0530
@@ -21,7 +21,7 @@
       <td>{{ talk.contact }}</td>
       <td>{{ talk.topic }}</td>
       <td>{{ talk.duration }}</td>
-      <td>{{ talk.audience }}</td>
+      <td>{{ talk.get_audience_display }}</td>
     </tr>
   {% endfor %}
 </table>
--- a/project/templates/talk/schedule.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/talk/schedule.html	Thu Nov 18 01:29:38 2010 +0530
@@ -2,188 +2,20 @@
 {% block content %}
 <h1>SciPy.in 2010 Schedule</h1>
 <p>SciPy.in is a 6-day programme from December 13th upto December 18th, of 2010
-comprising of two days each of conference, tutorials and sprints.</p>
+comprising of two days of conference, three days of tutorials followed by corresponding sprints and a day dedicated completely to sprints.</p>
 
 
     <strong>Over all break up of activites</strong>
 
     <table cellspacing="5">
       <tr> <td align=center><strong>Date</strong></td><td><strong>Activity</strong></td> </tr>
-      <tr > <td align=right>Monday, Dec. 13 2010</td><td>Conference</td> </tr>
-      <tr> <td align=right>Tuesday, Dec. 14 2010</td><td>Conference</td> </tr>
-      <tr> <td align=right>Wednesday, Dec. 15 2010</td><td>Tutorials/Sprint</td> </tr>
-      <tr> <td align=right>Thursday, Dec. 16 2010</td><td>Tutorials/Sprint</td> </tr>
-      <tr> <td align=right>Friday, Dec. 17 2010</td><td>Tutorials/Sprint</td> </tr>
-      <tr> <td align=right>Saturday, Dec. 18 2010</td><td>Full Sprint</td> </tr>
+      <tr > <td align=right>Monday, Dec. 13 2010</td><td><a href="/{{ params.scope }}/talks-cfp/conference/">Conference</a></td> </tr>
+      <tr> <td align=right>Tuesday, Dec. 14 2010</td><td><a href="/{{ params.scope }}/talks-cfp/conference/">Conference</a></td> </tr>
+      <tr> <td align=right>Wednesday, Dec. 15 2010</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
+      <tr> <td align=right>Thursday, Dec. 16 2010</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
+      <tr> <td align=right>Friday, Dec. 17 2010</td><td><a href="/{{ params.scope }}/tutorial/">Tutorials</a>/<a href="/{{ params.scope }}/sprints/">Sprint</a></td> </tr>
+      <tr> <td align=right>Saturday, Dec. 18 2010</td><td><a href="/{{ params.scope }}/sprints/">Full Sprint</a></td> </tr>
     </table>
 <br />
 
-<h2>Conference Schedule</h2>
-<h3>A detailed list of talks will be announced after accepting the CfP process
-completes. Check for relevant dates.</h3>
-<!-- 
-<h3><strong>Theme for Conference talks - "Scientific Python in Action" with respect to Application and Teaching</strong></h3>
-<strong>Talk type:</strong> Keynote: <img src="/img/keynote.png" alt="Keynote" /> 
-General/Non-programmer: <img src="/img/general.png" alt="General" />
-Beginner Programmer: <img src="/img/beginner.png" alt="Beginner" />
-Intermediate Programmer: <img src="/img/intermediate.png" alt="Intermediate" />
-Advanced Programmer: <img src="/img/beginner.png" alt="Advanced" />
-<br /><br />
-<h2>Wireless WEP hex key-phrase for access point "space": 8a61fcbcf9</h2>
-<br /> 
-<table class="list-all-talks">
-  <h2>Day 1, Saturday, December 12th, 2009</h2>
-  <tr>
-    <th class="speaker"><h4>Time</h4></th>
-    <th class="speaker"><h4>Talk</h4>Speaker</th>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>8:30AM - 9:30AM</td>
-    <td class="speaker" width="75%">Registration</td>
-  </tr>                              
-  <tr style="background-color: #90c9dc;">
-    <td>9:30AM - 10:15AM</td>
-    <td class="speaker" width="75%"><h4>Welcome</h4><hr />
-       <h4>Presidential Address</h4><hr />
-       <h4>Introduction to SciPy.in 2009</h4>Mr. Jarrod Millman<hr />
-       <h4>Inauguration</h4>Dr. Travis Oliphant<hr />
-       <h4>Vote of thanks</h4>Dr. Prabhu Ramachandran
-    </td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>10:15AM - 10:25AM</td>
-    <td class="speaker" width="75%"><h4>Introduction to Travis Oliphant</h4>Mr. Jarrod Millman</td>
-  </tr>
-  <tr style="background-color: #ebc91e;">
-    <td>10:25AM - 11:25AM</td>
-    <td class="speaker" width="75%"><h4>Keynote: SciPy Beginnings and Applications</h4>Dr. Travis Oliphant</td>
-  </tr>
-  <tr>
-    <td>11:25AM - 11:45AM</td>
-    <td class="speaker" width="75%"><h4>Tea Break</h4></td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>11:45AM - 12:45PM</td>
-    <td class="speaker" width="75%"><h4>Spoken Tutorials: Strategies for promoting open source software and
-bridging digital divide                             
-    </h4>Professor Kannan Moudgalya</td>
-  </tr>
-  <tr style="background-color: #f91828;">
-    <td>12:45PM - 1:15PM</td>
-    <td class="speaker" width="75%"><h4>A Python based SPH framework</h4>Chandrashekhar Kaushik</td>
-  </tr>
-  <tr>
-    <td>1:15PM - 2:15PM</td>
-    <td class="speaker" width="75%"><h4>Lunch Break</h4></td>
-  </tr>
-  <tr style="background-color: #04c9cb;">
-    <td>2:15PM - 2:45PM</td>
-    <td class="speaker" width="75%"><h4>Experimentation with python - why not do it the FOSS way?</h4>Praneeth Bodduluri &amp; Suryajith Chillara</td>
-  </tr>
-  <tr style="background-color: #33c910;">
-    <td>2:45PM - 3:15PM</td>
-    <td class="speaker" width="75%"><h4>Digital Image Processing with Python</h4>Debayan Banerjee</td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>3:15PM - 3:45PM</td>
-    <td class="speaker" width="75%"><h4>3D object recognition from 2D view-aspects using similarity measures</h4>Abhishek Pathak</td>
-  </tr>
-  <tr>
-    <td>3:45PM - 4:00PM</td>
-    <td class="speaker" width="75%"><h4>Tea Break</h4></td>
-  </tr>
-  <tr style="background-color: #f91828;">
-    <td>4:00PM - 5:00PM</td>
-    <td class="speaker" width="75%"><h4>Understanding GIL and How it affects your processing speed</h4>Senthil Kumaran</td>
-  </tr>
-  <tr style="background-color: #33c910;">
-    <td>5:00PM - 5:30PM</td>
-    <td class="speaker" width="75%"><h4>Language Detector for Python using n-gram</h4>Kumaran M</td>
-  </tr>
-  <tr>
-    <td>5:30PM - 6:00PM</td>
-    <td class="speaker" width="75%"><h4>General Break</h4></td>
-  </tr>
-  <tr  style="background-color: #90c9dc;">
-    <td>6:00PM - 7:00PM</td>
-    <td class="speaker" width="75%"><h4>Cultural events</h4></td>
-  </tr>
-  <tr>
-    <td>7:00PM - 8:30PM</td>
-    <td class="speaker" width="75%"><h4>Dinner</h4></td>
-  </tr>
-</table>
-<br /><br />
-<h2>Day 2, Sunday, December 13th, 2009</h2>
-<table class="list-all-talks">
-  <tr>
-    <th class="speaker"><h4>Time</h4></th>
-    <th class="speaker"><h4>Talk</h4>Speaker</th>
-  </tr>
-  <tr style="background-color: #04c9cb;">
-    <td>9:30AM - 10:00AM</td>
-    <td class="speaker" width="75%"><h4>Nipype</h4>Chris Burns</td>
-  </tr>
-  <tr style="background-color: #33c910;">
-    <td>10:00AM - 10:45AM</td>
-    <td class="speaker" width="75%"><h4>An update on the NumPy/SciPy projects &amp; a discussion of build and distribution systems</h4>David Cournapeau</td>
-  </tr>
-  <tr style="background-color: #04c9cb;">
-    <td>10:45AM - 11:15AM</td>
-    <td class="speaker" width="75%"><h4>A brief introduction to Sage</h4>Dr. Prabhu Ramachandran</td>
-  </tr>
-  <tr>
-    <td>11:15AM - 11:30AM</td>
-    <td class="speaker" width="75%"><h4>Tea Break</h4></td>
-  </tr>
-  <tr style="background-color: #04c9cb;">
-    <td>11:30AM - 12:00PM</td>
-    <td class="speaker" width="75%"><h4>Finding candidate transcription factors involved in gene regulation</h4>Farhat Habib</td>
-  </tr>
-  <tr style="background-color: #33c910;">
-    <td>12:00PM - 12:30PM</td>
-    <td class="speaker" width="75%"><h4>Python and AVRs: Perfect way to make cheap and functional instrumentation</h4>Akshay Srinivasan</td>
-  </tr>
-  <tr style="background-color: #04c9cb;">
-    <td>12:30PM -  1:00PM</td>
-    <td class="speaker" width="75%"><h4>Brain computer</h4>Deepak Nath</td>
-  </tr>
-  <tr>
-    <td>1:00PM - 2:00PM</td>
-    <td class="speaker"><h4>Lunch Break</h4></td>
-  </tr>
-  <tr style="background-color: #04c9cb;">
-    <td>3:00PM - 3:30PM</td>
-    <td class="speaker" width="75%"><h4>Chaco and Traits</h4>Dr. Travis Oliphant</td>
-  </tr>
-  <tr style="background-color: #33c910;">
-    <td>2:00PM - 3:00PM</td>
-    <td class="speaker" width="75%"><h4>Mayavi - Prabhu</h4>Dr. Prabhu Ramachandran</td>
-  </tr>
-  <tr>
-    <td>3:30PM - 3:45PM</td>
-    <td class="speaker"><h4>Tea Break</h4></td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>3:45PM - 4:15PM</td>
-    <td class="speaker" width="75%"><h4>SODAR data using fuzzy rule-base expert system package implemented in python</h4>Abhishek Pathak</td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>4:15PM - 4:45PM</td>
-    <td class="speaker" width="75%"><h4>A graph matching approach to classification of SODAR data</h4>Abhishek Pathak</td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>4:45PM - 5:15PM</td>
-    <td class="speaker" width="75%"><h4>The SciPy web and documentation tools</h4>Jarrod Millman</td>
-  </tr>
-  <tr style="background-color: #ebc91e;">
-    <td>5:15PM - 5:45PM</td>
-    <td class="speaker" width="75%"><h4>The FOSSEE project</h4>Asokan Pichai</td>
-  </tr>
-  <tr style="background-color: #90c9dc;">
-    <td>5:45PM - 6:00PM</td>
-    <td class="speaker" width="75%"><h4>Valedictory talk</h4>Dr. Prabhu Ramachandran</td>
-  </tr>
-</table>
- -->
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
--- a/project/templates/talk/speakers.html	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/templates/talk/speakers.html	Thu Nov 18 01:29:38 2010 +0530
@@ -44,7 +44,9 @@
     <div style="clear: both;"/>
     <br /><br />
 
-    <div id="speaker"><div id="speakerphoto"></div>
+    <div id="speaker"><div id="speakerphoto"><img alt="Perry Greenfield"
+        src="/static/img/perry.jpg" width=200/></div>
+    
     <div id="speakerinfo"><h3>Perry Greenfield</h3> 
       Perry Greenfield received a Ph.D. in Physics from M.I.T. His thesis
       was based on Very Large Array radio observations of the first discovered
@@ -67,7 +69,7 @@
 
     <div id="speaker">
     <div id="speakerphoto"><img alt="Prabhu Ramachandran"
-        src="/static/img/prabhu_ramachandran.jpg" /></div>
+        src="/static/img/prabhu_ramachandran.jpg" width=200/></div>
        <div id="speakerinfo"><h3>Prabhu Ramachandran</h3>
        Dr Prabhu has been a faculty member at the department of Aerospace Engineering, 
        IIT Bombay since 2005.  He has a PhD in Aerospace Engineering from IIT Madras.  
@@ -86,6 +88,8 @@
     <br /><br />
 
     <div id="speaker"><div id="speakerphoto"></div>
+    <div id="speaker"><div id="speakerphoto"><img alt="Stéfan van der Walt"
+        src="/static/img/stefan.jpg" /></div>
     <div id="speakerinfo"><h3>Stéfan van der Walt</h3> 
         Stéfan van der Walt is a researcher and lecturer in Applied Mathematics
         at Stellenbosch University, South Africa. He holds a BEng (E&E with CS)
--- a/project/urls.py	Thu Nov 18 01:20:54 2010 +0530
+++ b/project/urls.py	Thu Nov 18 01:29:38 2010 +0530
@@ -108,12 +108,12 @@
     url(r'^%s/talks-cfp/schedule/$' % (SCOPE_ARG_PATTERN),
         direct_to_template, {"template": "talk/schedule.html"},
         name='scipycon_schedule'),
-    url(r'^%s/talks-cfp/tutorial/$' % (SCOPE_ARG_PATTERN),
-        direct_to_template, {"template": "talk/tutorial-schedule.html"},
-        name='scipycon_tutorial_schedule'),
-    url(r'^%s/talks-cfp/sprint/$' % (SCOPE_ARG_PATTERN),
-        direct_to_template, {"template": "talk/sprint-schedule.html"},
-        name='scipycon_sprint_schedule'),
+    # url(r'^%s/talks-cfp/tutorial/$' % (SCOPE_ARG_PATTERN),
+    #     direct_to_template, {"template": "talk/tutorial-schedule.html"},
+    #     name='scipycon_tutorial_schedule'),
+    # url(r'^%s/talks-cfp/sprint/$' % (SCOPE_ARG_PATTERN),
+    #     direct_to_template, {"template": "talk/sprint-schedule.html"},
+    #     name='scipycon_sprint_schedule'),
     url(r'^%s/talks-cfp/speakers/$' % (SCOPE_ARG_PATTERN),
         direct_to_template, {"template": "talk/speakers.html"},
         name='scipycon_speakers'),
@@ -126,6 +126,18 @@
     url(r'^%s/organizers/$' % (SCOPE_ARG_PATTERN),
         direct_to_template, {"template": "about/organizers.html"},
         name='scipycon_organizers'),
+    url(r'^%s/talks-cfp/conference/$' % (SCOPE_ARG_PATTERN),
+        direct_to_template, {"template": "talk/conf_schedule.html"},
+        name='scipycon_conference'),
+    url(r'^%s/tutorial/$' % (SCOPE_ARG_PATTERN),
+        direct_to_template, {"template": "about/tutorial.html"},
+        name='scipycon_tutorial'),
+    url(r'^%s/sprints/$' % (SCOPE_ARG_PATTERN),
+        direct_to_template, {"template": "about/sprints.html"},
+        name='scipycon_sprints'),
+    url(r'^%s/certificates/$' % (SCOPE_ARG_PATTERN),
+        direct_to_template, {"template": "about/certificates.html"},
+        name='scipycon_certificates'),
 
     )