Code of conduct text is added

1 files changed, 16 insertions, 11 deletions

diff --git a/website/templates/base.html b/website/templates/base.html
index 20ae946..4deed0d 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -44,7 +44,7 @@
           <li> <a href="#speakers" class="smoothScroll">Speakers</a></li>

           <li> <a href="#attend" class="smoothScroll">Register</a></li>

           <li> <a href="#coc" class="smoothScroll">COC</a></li>

-          <li> <a href="{% url 'website:cfp' %}">Submit Proposal</a></li>

+          <li> <a href="{% url 'website:cfp' %}">Submit proposals</a></li>

 	 	  <li> <a href="#schedule" class="smoothScroll">Schedule</a></li>

           <li> <a href="#venue" class="smoothScroll">Venue</a></li>

           <li> <a href="#sponsors" class="smoothScroll">Sponsors</a></li>

@@ -89,13 +89,13 @@
         <col width="40%" />

     </colgroup>

 <tr>

-<td> <img class="img-responsive" src="{% static 'img/ajith.jpg' %}" height=70% width=60% alt="">

+<td> <img class="img-responsive" src="{% static 'img/ajith.jpg' %}" height=80% width=60% alt="">

 					<p>Dr. Ajith Kumar</p>

 									<a style = "color:#636363;" href="https://github.com/expeyes" target="_blank"><i class="icon-github" style="font-size:30px;"></i></a>

 									&nbsp;&nbsp;&nbsp;&nbsp;

         							<a style = "color:#636363;" href="http://expeyes.in/" target="_blank"><i class="icon-info" style="font-size:30px;"></i></a></td>

 

-<td> <img class="img-responsive" src="{% static 'img/anand1.png' %}" height=70% width=60% alt="">

+<td> <img class="img-responsive" src="{% static 'img/anand1.png' %}" height=80% width=60% alt="">

 					<p>Mr. S. Anand</p>

 									<a style = "color:#636363;" href="https://github.com/sanand0" target="_blank"><i class="icon-github" style="font-size:30px;"></i></a>

 									&nbsp;&nbsp;&nbsp;&nbsp;

@@ -133,7 +133,8 @@
 										<h9 style="color:white;">(Till 10 Nov 2016)</h9>

 								</td>

 								<td>

-									This ticket includes conference (tutorials + talks), lunch and snacks for 2 days. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.

+									This ticket includes conference (tutorials + talks), lunch, and snacks for 2 days and dinner for the first day. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.

+

 

 									</td>

 								</tr>

@@ -145,7 +146,8 @@
 										<h9 style="color:white;">(Till 30 Nov 2016)</h9>

 								</td>

 								<td>

-									This Ticket allows you to ONLY attend the conference for 2 Days (snacks shall be served). Does not include any conference amenities (Accommodation, Kit, Lunch & T-shirt). This is a non-refundable ticket.

+									This Ticket allows you to ONLY attend the conference for 2 Days (snacks shall be served). Does not include any conference amenities (Accommodation, Kit, Lunch, Dinner & T-shirt). This is a non-refundable ticket.

+

 									</td>

 								</tr>

 								<tr>

@@ -155,7 +157,8 @@
 										<h9 style="color:white;">(10 Nov - 30 Nov 2016)</h9>

 								</td>

 								<td>

-									This ticket includes conference (tutorials + talks), lunch and snacks for 2 days. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.</td>

+									This ticket includes conference (tutorials + talks), lunch and snacks for 2 days and dinner for the first day. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.

+								</td>

 								</tr> 

 								<tr>

 								<td bgcolor ="#9bb2e1">

@@ -165,6 +168,7 @@
 								</td>

 								<td>

 									 Accommodation is provided on a shared basis (twin sharing) inside IIT-B campus (Boys/Girls hostel). Accommodation will be provided for 2 days, i.e, 10-11 and 11-12 December. Accommodation does not include other amenities like dinner, etc. Extension of period of stay is not available. This is a non-refundable ticket.

+

 									</td>

 								<tr>

 								<td bgcolor= "#8cc9f0">

@@ -188,14 +192,15 @@
 								</footer>

 							</section>

 

+

 		

 <section id="coc" class="main special">

 								<div class="spotlight">

 									<div class="content">

 										<header class="major">

-											<h2>CODE FOR CONDUCT</h2>	

+											<h2>CODE FOR CONDUCT</h2>	</header>

 											<div id="schedule" name="schedule">

-												 <h3>To be announced<h3>

+												 <p align="justify" >We appreciate your participation in SciPy 2016. We want you to have an enjoyable and enriching experience in the conference. For this all the attendees are required to conform to the following Code of Conduct. Organisers will ensure that it is enforced throughout the event.<p>

         </div> 

       </div>

 			</section>

@@ -222,7 +227,7 @@
     <div class="tab-content">

         <div id="day1" class="tab-pane fade in active">

             <p>

-        </p><center><h4>10 Dec 2015: Day 1</h4></center>

+        </p><center><h4>10 Dec 2016: Day 1</h4></center>

               <table class="table table-bordered">

                                 <tbody><tr style="background-color:#f0f0f0">

                                 	<td>Tutorials (Parallel tracks) :</td>

@@ -236,10 +241,10 @@
         </div>

         <div id="day2" class="tab-pane fade">

             <p>

-              </p><center><h4>12 Dec 2015: Day 2</h4></center>

+              </p><center><h4>12 Dec 2016: Day 2</h4></center>

                <table class="table table-bordered">

                                 <tbody><tr style="background-color:#f0f0f0">

-                                	<td>Conference and talks :</td>

+                                	<td>Conference and talks </td>

                                 </tr>

 

               </tbody></table>