Merged heads 2011
authorPrimal Pappachan <primal007@gmail.com>
Fri, 02 Dec 2011 16:11:19 +0530
branch2011
changeset 474 83ea39f44032
parent 473 5610783f66d6 (current diff)
parent 468 8474b14179cf (diff)
child 475 6f5e358c0a10
Merged heads
--- a/project/templates/_menu.html	Thu Dec 01 19:05:43 2011 +0530
+++ b/project/templates/_menu.html	Fri Dec 02 16:11:19 2011 +0530
@@ -103,4 +103,10 @@
     <li><a href="/{{ params.scope }}/manage_payments/">Manage Payments</a></li>
     {% endif %}
   </ul>
+    <div style="width:250px;height:100px;border:1px solid blue;">
+Important information for Participants: <br/>
+You are requested to approach the <b>Scipy Kiosk 
+setup</b> beside the Main Gate, to collect your 
+room keys & <br/>for other information.
 </div>
+</div>
--- a/project/templates/talk/conf_schedule.html	Thu Dec 01 19:05:43 2011 +0530
+++ b/project/templates/talk/conf_schedule.html	Fri Dec 02 16:11:19 2011 +0530
@@ -17,26 +17,24 @@
 <tr><td class="right">09:15-10:15</td><td class="left">Eric Jones</td><td class="left"><b>Keynote</b></td></tr>
 <tr><td class="right">10:15-10:45</td><td class="left"></td><td class="left">Tea Break</td></tr>
 <tr><td class="right">10:45-11:05</td><td class="left">Ankur Gupta</td><td class="left"><a href="#sec2.2">Multiprocessing module and Gearman</a></td></tr>
-<tr><td class="right">11:05-11:25</td><td class="left">Robson Benjamin</td><td class="left"><a href="#sec2.3">Automated Measurement of Magnetic properties of Ferro-Magnetic materials using Python</a></td></tr>
-<tr><td class="right">11:25-12:10</td><td class="left">Mateusz Paprocki</td><td class="left"><b>Invited</b></td></tr>
-<tr><td class="right">12:10-13:10</td><td class="left"></td><td class="left"><b>Lunch</b></td></tr>
-<tr><td class="right">13:10-13:55</td><td class="left">Ajith Kumar</td><td class="left"><b>Invited</b></td></tr>
-<tr><td class="right">13:55-14:15</td><td class="left">Bala Subrahmanyam Varanasi</td><td class="left"><a href="#sec2.6">Sentiment Analysis</a></td></tr>
-<tr><td class="right">14:15-14:45</td><td class="left">Vishal Kanaujia</td><td class="left"><a href="#sec2.7">Exploiting the power of multicore for scientific computing in Python</a></td></tr>
-<tr><td class="right">14:45-14:55</td><td class="left"></td><td class="left"><b>Lightning Talks</b></td></tr>
-<tr><td class="right">14:55-15:25</td><td class="left"></td><td class="left"><b>Tea Break</b></td></tr>
-<tr><td class="right">15:25-16:10</td><td class="left">Prabhu Ramachandran</td><td class="left"><b>Invited Talk</b></td></tr>
-<tr><td class="right">16:10-16:40</td><td class="left">Jayneil Dalal</td><td class="left"><a href="#sec2.8">Building Embedded Systems for Image Processing using Python</a></td></tr>
-<tr><td class="right">16:40-17:10</td><td class="left">Kunal Puri</td><td class="left"><a href="#sec2.9">Smoothed Particle Hydrodynamics with Python</a></td></tr>
-<tr><td class="right">17:10-17:30</td><td class="left">Nivedita Datta</td><td class="left"><a href="#sec2.10">Encryptedly yours : Python & Cryptography</a></td></tr>
+<tr><td class="right">11:05-11:35</td><td class="left">Kunal Puri</td><td class="left"><a href="#sec2.9">Smoothed Particle Hydrodynamics with Python</a></td></tr>
+<tr><td class="right">11:35-12:20</td><td class="left">Mateusz Paprocki</td><td class="left"><b>Invited</b></td></tr>
+<tr><td class="right">12:20-13:20</td><td class="left"></td><td class="left"><b>Lunch</b></td></tr>
+<tr><td class="right">13:20-14:05</td><td class="left">Ajith Kumar</td><td class="left"><b>Invited</b></td></tr>
+<tr><td class="right">14:05-14:25</td><td class="left">Bala Subrahmanyam Varanasi</td><td class="left"><a href="#sec2.6">Sentiment Analysis</a></td></tr>
+<tr><td class="right">14:25-14:55</td><td class="left">Jayneil Dalal</td><td class="left"><a href="#sec2.8">Building Embedded Systems for Image Processing using Python</a></td></tr>
+<tr><td class="right">14:55-15:05</td><td class="left">IITB Students</td><td class="left">Project Presentation</a></td></tr>
+<tr><td class="right">15:05-15:35</td><td class="left"></td><td class="left"><b>Tea Break</b></td></tr>
+<tr><td class="right">15:35-16:20</td><td class="left">Prabhu Ramachandran</td><td class="left"><b>Invited Talk</b></td></tr>
 
+<tr><td class="right">16:20-16:40</td><td class="left">Robson Benjamin</td><td class="left"><a href="#sec2.3">Automated Measurement of Magnetic properties of Ferro-Magnetic materials using Python</a></td></tr>
+<tr><td class="right">16:40-17:00</td><td class="left">Nivedita Datta</td><td class="left"><a href="#sec2.10">Encryptedly yours : Python & Cryptography</a></td></tr>
+<tr><td class="right">17:10-17:30</td><td class="left"></td><td class="left"><b>Lightning Talks</b></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 class="right" /><col class="left" /><col class="left" />
@@ -59,7 +57,7 @@
 <tr><td class="right">15:00-15:30</td><td class="left"></td><td class="left"><b>Tea</b></td></tr>
 <tr><td class="right">15:30-16:00</td><td class="left">Kunal Puri</td><td class="left"><a href="#sec2.21">GPU Accelerated Computational Fluid Dynamics with Python</a></td></tr>
 <tr><td class="right">16:00-16:10</td><td class="left">Sachin Shinde</td><td class="left"><a href="#sec2.22">Reverse Engineering and python</a></td></tr>
-<tr><td class="right">16:10-16:40</td><td class="left">Jarrod Millman</td><td class="left"><b>Invited</b></td></tr>
+<tr><td class="right">16:10-16:40</td><td class="left">Vishal Kanaujia</td><td class="left"><a href="#sec2.7">Exploiting the power of multicore for scientific computing in Python</a></td></tr>
 <tr><td class="right">16:40-17:00</td><td class="left"></td><td class="left"><b>Lightning Talks</b></td></tr>
 </tbody>
 </table>