merged changes from primal 2011
authorParth buch <parth.buch.115@gmail.com>
Fri, 02 Dec 2011 16:12:58 +0530
branch2011
changeset 470 02ebcf395866
parent 469 40025d462588 (current diff)
parent 468 8474b14179cf (diff)
child 471 7b4e105b68ba
merged changes from primal
--- a/project/templates/_menu.html	Fri Dec 02 16:10:48 2011 +0530
+++ b/project/templates/_menu.html	Fri Dec 02 16:12:58 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	Fri Dec 02 16:10:48 2011 +0530
+++ b/project/templates/talk/conf_schedule.html	Fri Dec 02 16:12:58 2011 +0530
@@ -23,12 +23,12 @@
 <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"></td><td class="left"><b>Lightning Talks</b></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:30</td><td class="left">IITB Students</td><td class="left"><a href="#sec2.8">Project Presentation</a></td></tr>
-<tr><td class="right">16:30-16:50</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:50-17:10</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">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>