Merge the south migration branch with an additional field for Laptop registration number with default branch.

--HG--
branch : south-migration

2 files changed, 173 insertions, 26 deletions

diff --git a/project/templates/about/fees.html b/project/templates/about/fees.html
index 63d3fc2..ec751f5 100644
--- a/project/templates/about/fees.html
+++ b/project/templates/about/fees.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% block content %}
 
-<h2>Fees </h2>
+<h2 id="sec-1">Fees </h2>
 
-<h3>Registration fees for outstation students and teachers. </h3>
+<h3 id="sec-1_1">Registration fees for outstation students and teachers. </h3>
 
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
@@ -12,7 +12,6 @@
 <thead>
 <tr><th scope="col">Category</th><th scope="col">Conference</th><th scope="col">Accommodation</th></tr>
 <tr><th scope="col"></th><th scope="col">+ Tutorials</th><th scope="col">(all 6 days)</th></tr>
-
 </thead>
 <tbody>
 <tr><td>Students</td><td>Rs. 500</td><td>Rs. 300</td></tr>
@@ -20,10 +19,10 @@
 </tbody>
 </table>
 
-<p>Registration fees along with the accommodation charges can be paid either by electronic transfer (account no. - ) or by sending a Demand Draft for the amount of Rs.800 (for all 6 days). </p>
+<h4 id="sec-1_1_1">Registration fees along with the accommodation charges can be paid either by electronic transfer (<a href="#sec-2_2_2">details</a>) or by sending a Demand Draft for the amount of Rs.800 (for all 6 days). </h4>
 
-<h3>Registration fees for in-station students and teachers. </h3>
 
+<h3 id="sec-1_2">Registration fees for in-station students and teachers. </h3>
 
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
@@ -36,15 +35,12 @@
 <tbody>
 <tr><td>Students</td><td>Rs. 500</td></tr>
 <tr><td>Teachers</td><td>Rs. 500</td></tr>
-
 </tbody>
 </table>
 
+<h4 id="sec-1_2_1">Registration fees can be paid either by electronic transfer (<a href="#sec-2_2_2">details</a>) or by sending a Demand Draft for the amount of Rs.500 (for all 6 days). </h4>
 
-
-<p>Registration fees can be paid either by electronic transfer (account no. - ) or by sending a Demand Draft for the amount of Rs.500 (for all 6 days). </p>
-
-<h3>Registration fees for corporates and others. </h3>
+<h3 id="sec-1_3">Registration fees for corporates and others. </h3>
 
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
@@ -52,7 +48,6 @@
 </colgroup>
 <thead>
 <tr><th scope="col">Category</th><th scope="col">Conference</th><th scope="col">Tutorials + sprints</th></tr>
-
 </thead>
 <tbody>
 <tr><td>Corporates</td><td>Rs. 2000</td><td>Rs. 1000 per day</td></tr>
@@ -60,14 +55,14 @@
 </tbody>
 </table>
 
-<p>Registration fees corresponding to the conference +( number of tutorial days * 1000) can be paid either by electronic transfer (account no. - ) or by sending a Demand Draft. </p>
+<h4 id="sec-1_3_1">Registration fees corresponding to the conference +( number of tutorial days * 1000) can be paid either by electronic transfer (<a href="#sec-2_2_2">details</a>) or by sending a Demand Draft. </h4>
 
 <ul>
-<li>For example, if attending the conference and 2 of the tutorial days, the fees payable would be Rs. 2000 + (2 * Rs. 1000) = Rs. 4000. <br/>
+<li id="sec-1_3_1_1">For example, if attending the conference and 2 of the tutorial days, the fees payable would be Rs. 2000 + (2 * Rs. 1000) = Rs. 4000. <br/>
 </li>
 </ul>
 
-<h3>Spot registration / late payment(on-spot) </h3>
+<h3 id="sec-1_4">Spot registration / late payment(on-spot) </h3>
 
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
@@ -78,45 +73,47 @@
 </thead>
 <tbody>
 <tr><td>Students</td><td>Rs. 750</td><td>Included in conference fee</td></tr>
-
 <tr><td>Teachers</td><td>Rs. 750</td><td>Included in conference fee</td></tr>
 <tr><td>Corporates</td><td>Rs. 2500</td><td>Rs. 1250 per day</td></tr>
 </tbody>
 </table>
 
-<h2>Note: </h2>
-
-<h3>Accommodation </h3>
+<h2 id="sec-2">Note: </h2>
 
+<h3 id="sec-2_1">Accommodation </h3>
 
 <ul>
 <li>
-Accommodation will be provided at a subsidized rate of Rs.50 for day for outstation teachers and students alone. 
-
+Accommodation will be provided at a subsidized rate of Rs.50 per day for outstation teachers and students alone. 
 </li>
 <li>
-Accommodation will be confirmed only upon receipt of the fee.
+Accommodation fees has to remitted on or before 6th of December, 2010. If you are sending us a DD, it should reach us on or before 8th of December, 2010.
 </li>
 <li>
 Accommodation will be confirmed at the venue only for participants with valid identity cards from their respective institutions.
 </li>
 </ul>
 
-<h3>Registration </h3>
+<h3 id="sec-2_2">Registration Fees </h3>
+
+<h4 id="sec-2_2_1">Demand Draft </h4>
 
 <ul>
 <li>
-An email should be sent to info@scipy.in with the name of the participant, user id on the website, institution, and the transaction details(reference no. and account no.)
+An email should be sent to <i>info@scipy.in</i> with the name of the
+participant, user id on the website, institution, and the
+transaction details(reference no. and account no.)
 </li>
 <li>
-Registered participants whose talks have been accepted will be exempt from the registration fees.
+Registered participants whose talks have been accepted will be
+exempt from the registration fees.
 </li>
 <li>
-The demand draft may be obtained in favour of <b>Prof. Prabhu Ramachandran</b> payable at <b>Mumbai</b>.
+The demand draft may be obtained in favour of <b>FOSSEE</b> payable at
+<b>Mumbai</b>.
 </li>
 <li>
 The Demand Drafts may be sent to
-
 <pre class="example">
 Prof. Prabhu Ramachandran,
 Department of Aerospace Engineering,
@@ -128,4 +125,36 @@ India 400 076
 </li>
 </ul>
 
+<h4 id="sec-2_2_2">Electronic transfer (NEFT) </h4>
+
+<ul>
+<li>
+An email should be sent to <i>info@scipy.in</i> with the name of the
+participant, user id on the website, institution, and the
+transaction details(reference no. and account no., account holder
+name from which the transfer was made.)
+</li>
+<li>
+Registered participants whose talks have been accepted will be
+exempt from the registration fees.
+</li>
+<li>
+The total amount for fees and accommodation (if applicable) may be
+transfered to,
+<pre class="example">
+Account Number - 2724101100988
+Account Name - FOSSEE
+IFSC code - CNRB0002724
+Bank - Canara Bank
+Branch - IIT Powai, Mumbai - 400076
+</pre>
+
+</li>
+<li>
+While transferring the amount, ensure that the remark of transaction
+contain the user-name on website and (or) Full name with email
+address registered with us.
+
+</li>
+</ul>
 {% endblock content %}
diff --git a/project/templates/user/dump.html b/project/templates/user/dump.html
new file mode 100644
index 0000000..061201b
--- /dev/null
+++ b/project/templates/user/dump.html
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml"

+lang="en" xml:lang="en">

+<head>

+<title>Scipy User Dump</title>

+<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>

+<meta name="generator" content="Org-mode"/>

+<meta name="generated" content="2010-11-12 18:35:22 IST"/>

+<meta name="author" content="amit"/>

+<meta name="description" content=""/>

+<meta name="keywords" content=""/>

+<style type="text/css">

+ <!--/*--><![CDATA[/*><!--*/

+  html { font-family: Times, serif; font-size: 12pt; }

+  .title  { text-align: center; }

+  .todo   { color: red; }

+  .done   { color: green; }

+  .tag    { background-color: #add8e6; font-weight:normal }

+  .target { }

+  .timestamp { color: #bebebe; }

+  .timestamp-kwd { color: #5f9ea0; }

+  p.verse { margin-left: 3% }

+  pre {

+	border: 1pt solid #AEBDCC;

+	background-color: #F3F5F7;

+	padding: 5pt;

+	font-family: courier, monospace;

+        font-size: 90%;

+        overflow:auto;

+  }

+  table { border-collapse: collapse; }

+  td, th { vertical-align: top; }

+  dt { font-weight: bold; }

+  div.figure { padding: 0.5em; }

+  div.figure p { text-align: center; }

+  textarea { overflow-x: auto; }

+  .linenr { font-size:smaller }

+  .code-highlighted {background-color:#ffff00;}

+  .org-info-js_info-navigation { border-style:none; }

+  #org-info-js_console-label { font-size:10px; font-weight:bold;

+                               white-space:nowrap; }

+  .org-info-js_search-highlight {background-color:#ffff00; color:#000000;

+                                 font-weight:bold; }

+  /*]]>*/-->

+</style>

+<script type="text/javascript">

+<!--/*--><![CDATA[/*><!--*/

+ function CodeHighlightOn(elem, id)

+ {

+   var target = document.getElementById(id);

+   if(null != target) {

+     elem.cacheClassElem = elem.className;

+     elem.cacheClassTarget = target.className;

+     target.className = "code-highlighted";

+     elem.className   = "code-highlighted";

+   }

+ }

+ function CodeHighlightOff(elem, id)

+ {

+   var target = document.getElementById(id);

+   if(elem.cacheClassElem)

+     elem.className = elem.cacheClassElem;

+   if(elem.cacheClassTarget)

+     target.className = elem.cacheClassTarget;

+ }

+/*]]>*///-->

+</script>

+</head>

+<body>

+<div id="content">

+

+<h1 class="title">User Dump</h1>

+

+

+

+

+<div id="outline-container-1" class="outline-2">

+<div class="outline-text-2" id="text-1">

+

+

+<ul>

+<li>

+Gender - '&ndash;' in case not specified

+</li>

+<li>

+C - Conference

+</li>

+<li>

+S - Sprints

+</li>

+<li>

+T - Tutorial

+</li>

+<li>

+L - Bring a Laptop

+

+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">

+<caption></caption>

+<colgroup><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="right" /><col align="right" /><col align="right" /><col align="right" />

+</colgroup>

+<tbody>

+<tr><td><i>first name</i></td><td><i>last name</i></td><td><i>Gender</i></td><td><i>City</i></td><td><i>Organization</i></td><td><i>Occupation</i></td><td></i>C</td><td><i>S</i></td><td><i>T</i></td><td><i>L</i></td></tr>

+

+{% for row in rows %}

+<tr><td>{{ row.first_name }}</td><td>{{ row.last_name }}</td><td>{{ row.sex }}</td><td>{{ row.city }}</td><td>{{ row.organization }}</td><td>{{ row.occupation }}</td><td>{{ row.conference }}</td><td>{{ row.sprint }}</td><td>{{ row.tutorial }}</td><td>{{ row.wifi }}</td></tr>

+

+{% endfor %}

+</table>

+

+</li>

+</ul>

+</div>

+</div>

+</div>

+</body>

+</html>