Merge branch 'master' of https://github.com/FOSSEE/nccps-2018 into develop

2 files changed, 36 insertions, 46 deletions

diff --git a/static/website/templates/header.html b/static/website/templates/header.html
index 6a6152c..1dbe8e2 100644
--- a/static/website/templates/header.html
+++ b/static/website/templates/header.html
@@ -22,17 +22,6 @@
     <link rel="stylesheet" href="{% static 'website/bootstrap-css/bower_components/ionicons/css/ionicons.min.css' %}">
     <link rel="stylesheet" href="{% static 'website/bootstrap-css/assets/css/main.css' %}">
     <link rel="stylesheet" href="{% static 'website/bootstrap-css/custom.css' %}">
-    <script type="text/javascript">
-// Wait for window load
-jQuery(document).ready(function($){
-    $(window).load(function() {
-        // Animate loader off screen
-        $(".se-pre-con").fadeOut("slow");
-    });
-
-    });
-
-</script>
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-82999923-8"></script>
 <script>
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index f554cee..b53e449 100644
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -158,70 +158,71 @@
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
                           Regular Registration
-                          <br>(15 Sept 2018 - 25 Oct 2018)    
+                          <br>(15 Sept 2018 - 16 Nov 2018)    
                           </div>
                     </td>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Rs. 750
+                          INR 750 + 18% = INR 885
                           </div>
                     </td>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Rs. 1,000
+                          INR 1,000 + 18% = INR 1,180
+
                           </div>
                     </td>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Rs. 2,000
+                          INR 2,000 + 18% = INR 2,360
                           </div>
                     </td>
                     </tr>
                     <tr>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Late Registration
-                          <br>(26 Oct 2018 - 25 Nov 2018)    
+                          Spot Registration
                           </div>
                     </td>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Rs. 900
+                          INR 900 + 18% = INR 1,062
                           </div>
                     </td>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Rs. 1,200
+                          INR 12,00 + 18% = INR 1,416
                           </div>
                     </td>
                     <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Rs. 2,500
+                          INR 2,500 + 18% = INR 2,950
                           </div>
                     </td>
                     </tr>
                     <tr>
-                    <td style="vertical-align:bottom;border-top:none;!important">
-                          <div class="align-baseline">
-                          Spot Registration    
-                          </div>
-                    </td>
-                    <td style="vertical-align:bottom;border-top:none;!important">
-                          <div class="align-baseline">
-                          Rs. 1,100
-                          </div>
-                    </td>
-                    <td style="vertical-align:bottom;border-top:none;!important">
-                          <div class="align-baseline">
-                          Rs. 1,500
-                          </div>
-                    </td>
-                    <td style="vertical-align:bottom;border-top:none;!important">
-                          <div class="align-baseline">
-                          Rs. 3,000
-                          </div>
-                    </td>
-                    </tr>
+              <td colspan="4">
+              <p class="text-justify"><b>Payment instructions:</b></span></p>
+                <p><span class="text-justify">Please read the instructions carefully, before proceeding for Registration.</span></p>
+                <ol>
+                <li><span class="text-justify">Please make the payment for the conference through Net banking using NEFT or RTGS or IMPS</span></li>
+                <li><span class="text-justify">Account Details for transaction are mentioned below:</span></li>
+                <ul>
+                <li><span class="text-justify">Bank Name - State Bank of India</span></li>
+                <li><span class="text-justify">Branch Name - IIT, &nbsp;Powai Branch</span></li>
+                <li><span class="text-justify">Bank address - Adi Shankaracharya marg, &nbsp;IIT Bombay, Powai, Mumbai - 400076</span></li>
+                <li><span class="text-justify">9-Digit Code no. of the bank and the branch - 400002034</span></li>
+                <li><span class="text-justify">Account number - 10725729128</span></li>
+                <li><span class="text-justify">IFSC Code/ NEFT/ RTGS code - SBIN0001109</span></li>
+                <li><span class="text-justify">Swift Code - SBININBB519</span></li>
+                </ul>
+                <li><span class="text-justify">After successful payment take the screenshot of the final transaction. Save this screenshot as you have to upload it in the form. </span></li>
+                <li><span class="text-justify">Collect your transaction reference number / UTR number from the bank. Note it down somewhere you have to fill this detail in the form as well.</span></li>
+                <li><span class="text-justify">After verification of your payment by our team, we shall send you the ticket for the conference via email. This shall take 2-3 working days.</span>
+                </li>
+                </ol>
+              </td>
+              </tr>
                   </table>
                 </div>
             </div>
@@ -244,21 +245,21 @@
               </td>
               <td style="vertical-align:bottom;border-top:none;!important">
                 <div class="align-baseline">
-                  We have limited Low cost accommodation, guaranteed only if you register early.
+                  We have limited Low cost accommodation, guaranteed only if you register early. Approximate cost  of the accomodation for 1 night will be INR. 1400. You have to make the payment directly to the hotel during check-out via cash / card.
+
                 </div>
               </td>
               </tr>
               <tr>
               <td style="vertical-align:bottom;border-top:none;!important">
                 <div class="align-baseline">
-                  T Shirt<br>   
-                  Rs 350/-<br>
+                  T Shirt<br>
                   Add on
                 </div>
               </td>
               <td style="vertical-align:bottom;border-top:none;!important">
                 <div class="align-baseline">
-                  Change of size, exchange at the venue is not available. This is  a non-refundable and non-transferable ticket.
+                  Change of size, exchange at the venue is not available. This is  a non-refundable and non-transferable ticket. The T-shirt cost will be INR 350/- each. You will have to make the payment at the venue.
                 </div>
               </td>
               </tr>
@@ -268,7 +269,7 @@
             <div class="row">
               <div class="col-md-12">
               <center>
-                <a data-toggle="modal" data-target="#registermdl" class="btn btn-primary">Register now</a>
+                <a href ="https://docs.google.com/forms/d/e/1FAIpQLScdCE6RLbHqF7c7hAnRNwRsHvWCnPaBvdATMIX9enXote9wKg/viewform" class="btn btn-primary" target ="_blank">Register now</a>
               </center>
               </div>
             </div>