Home page to be made live

4 files changed, 130 insertions, 29 deletions

diff --git a/website/templates/base.html b/website/templates/base.html
index 4deed0d..2787a96 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -25,7 +25,7 @@
 						<p style="color:#484848; font-weight:700; font-size:28px;" >DECEMBER 10 & 11</p><br><br>

             			

             	 <a href="#attend" class="button special" style="width : 220px;" >Register</a></center>

-            	 <a href="{% url 'website:cfp' %}" class="button special"  style="width : 220px;">Submit Proposals</a></center>

+            	 <a href="{% url 'website:cfp' %}" class="button special"  style="width : 220px;">Submit</a></center>

 					</header>

 {% endblock %}

 

@@ -44,10 +44,10 @@
           <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 proposals</a></li>

+          <li> <a href="{% url 'website:cfp' %}">Submit</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>

+          <li> <a href="#poster" class="smoothScroll">Poster</a></li>

           <li> <a href="#contact" class="smoothScroll">Contact</a></li>

         </ul>

       </div>

@@ -75,7 +75,6 @@
 							</section>

 

 

-

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

 								<div class="spotlight">

 									<div class="content">

@@ -86,24 +85,29 @@
 		<table>

 			<colgroup>

         <col width="40%" />

+        <col width= "20%"/>

         <col width="40%" />

     </colgroup>

 <tr>

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

-					<p>Dr. Ajith Kumar</p>

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

+					</td>

+<td></td>

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

+					</td>

+

+</tr>

+<tr>

+<td><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=80% width=60% alt="">

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

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

+        							<td><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;

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

-

 </tr>

 <tr>

-<td> Dr. B. P. Ajith Kumar, a scientist working with the <a target="_blank" href = "http://www.iuac.res.in/">IUAC</a>. His main area of work is development of instrumentation for particle accelerators and associated experiments, including radio-frequency accelerating structures, control and data acquisition systems, digital and radio frequency electronics modules. He initiated the Phoenix / expEYES project. ExpEYES is currently the cheapest educational system to teach science. </td>

+<td> Dr. B. P. Ajith Kumar, a scientist working with the <a target="_blank" href = "http://www.iuac.res.in/">IUAC</a>. His main area of work is development of instrumentation for particle accelerators and associated experiments, including radio-frequency accelerating structures, control and data acquisition systems, digital and radio frequency electronics modules. He initiated the Phoenix / expEYES project. ExpEYES is currently the cheapest educational system to teach science. </td><td></td>

 <td> Anand is the Chief Executive Officer at Gramener. He leads a team of data enthusiasts with skills in analysis, design, programming and statistics. He studied at IIT Madras, IIM Bangalore and LBS, and worked at IBM, Infosys, Lehman Brothers and BCG. He and his team explore insights from data and communicate these as visual stories. These visual analyses and dashboards are built on the Gramener Visualisation Server -- Gramener's flagship product. </td>

 </tr>

 		</table>

@@ -202,7 +206,79 @@
 											<div id="schedule" name="schedule">

 												 <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 >

+    <div class="tab-content">

+        <div id="short" class="tab-pane fade">

+            <p>

+              <table class="table table-bordered">

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

+                                	<td>

+<p>SciPy India is dedicated to providing a harassment-free conference experience for everyone, regardless of age, gender, sexual orientation, physical appearance, disability, race, religion or employment. We don't tolerate harassment of attendees in any form.</p>

+

+<p>All communication should be appropriate for a professional audience, including people from many different backgrounds.</p>

+

+<p><li><b>Code for Speakers:</b></li></p>

+

+<p>Sexual language or imagery is inappropriate for your talks or slides. Refrain from using sexist, racist or exclusionary language anywhere in your content.</p>

+

+<p><li><b>Code for Participants:</b></li></p>

+

+<p>Be kind and sensitive to the people around you and avoid any kind of offensive behavior. Sexist, racist or any other form of exclusionary or offensive jokes or excessive public swearing are not appropriate at any venue of SciPy India. Attendees violating these rules may be asked to leave the conference without a refund at the sole discretion of the conference organizers. Thank you for your consideration and help in making SciPy India a welcoming, friendly event for all of us.</p>

+</td>

+                                </tr>

+              </tbody></table>

+         

+            <p></p>

+        </div>

+        <div id="long" class="tab-pane fade">

+            <p>

+               <table class="table table-bordered">

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

+                                	<td><p>SciPy India is dedicated to providing a harassment-free conference experience for everyone, regardless of age, gender, sexual orientation, physical appearance, disability, race, religion or employment.</p>

+

+<p>Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, body size, race, religion, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, sustained disruption of talks or other events, inappropriate physical contact, and unwelcome sexual attention. We have zero tolerance on harassment of conference participants in any form, including, but not limited to the activities mentioned here.</p>

+

+<p>Participants asked to stop any harassing behavior are expected to comply immediately.</p>

+

+<p>All communication should be appropriate for a professional audience, including people from many different backgrounds. Sexual language or imagery is inappropriate for all aspects of the conference, including talks. Remember that sexist, racist or any other form of exclusionary or offensive jokes or excessive public swearing are not appropriate at any venue of SciPy India.</p>

+

+<p>Do not insult or put down attendees or engage in any action that violates the open, welcoming and sharing spirit of the conference. Be kind and sensitive to the people around you when you are attending the conference, and avoid any kind of offensive or degrading behavior.</p>

+

+<p>If a participant engages in behavior that violates this code of conduct, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference with no refund.</p>

+

+<p>Thank you for helping to make SciPy 2016 a welcoming, friendly event for all.</p>

+

+<p><b><li>Contact Information:</li></b></p>

+

+<p>If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing "SciPy India: Organiser" badges.</p>

+

+<p>Conference staff will be happy to help participants contact venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference. We value your attendance.</p>

+

+<p><b><li>License:</li></b></p>

+

+<p>This Code of Conduct was forked from PSF Code of Conduct by Python Software Foundation which is under a Creative Commons Attribution 3.0 Unported License.</p>

+

+<p>SciPy India Conference Code of Conduct is licensed under a Creative Commons Attribution 3.0 Unported License.</p>

+</td>

+                                </tr>

+

+              </tbody></table>

+            <p></p>

+        </div>

+       

+

+      </div>

+

+    <ul class="nav nav-tabs">

+        <li>

+        <a style="background: #efa8b0;" data-toggle="tab" href="http://scipy.in/2016#short">Short Version</a></li>

+        <li><a style="background: #c79cc8;" data-toggle="tab" href="http://scipy.in/2016#long">Long Version</a></li>

+    </ul>

+

+

       </div>

+  </div>

 			</section>

 

 

@@ -217,8 +293,8 @@
        <center>

            <ul class="nav nav-tabs">

         <li class="active">

-        <a style="background: #efa8b0;" data-toggle="tab" href="http://scipy.in/2015#day1">Day 1</a></li>

-        <li><a style="background: #c79cc8;" data-toggle="tab" href="http://scipy.in/2015#day2">Day 2</a></li>

+        <a style="background: #efa8b0;" data-toggle="tab" href="http://scipy.in/2016#day1">Day 1</a></li>

+        <li><a style="background: #c79cc8;" data-toggle="tab" href="http://scipy.in/2016#day2">Day 2</a></li>

 		<!--<li><a style="background: #a89cc8;" data-toggle="tab" href="http://scipy.in/2015#day3">Day 3</a></li>-->		

 		<!-- <li><a style="background: #9bb2e1;"data-toggle="tab" href="http://scipy.in/2015#paper">Workshop Resources</a></li>

 		<li><a style="background: #8cc9f0;" data-toggle="tab" href="http://scipy.in/2015#workshop">Workshop Instructions</a></li>

@@ -241,7 +317,7 @@
         </div>

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

             <p>

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

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

                <table class="table table-bordered">

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

                                 	<td>Conference and talks </td>

@@ -269,13 +345,24 @@
                 </section>

 

 

+<section id="poster" class = "main special">

+<div class="spotlight">

+		<div class="content">

+						<header class="major">

+											<h2>POSTER</h2></header>

+											<a href="http://fossee.in/data/emails/images/scipy_poster_2015.pdf" target="_blank">   <img height = 20%, width=20% src="{% static 'img/sd.png'%}" /></a>

+

+											<p align="justify">We request you to share the event details through this poster with faculty members, students and others who might be interested. You may print the poster (native size - A4) and display on the notice boards.</p>

+							</div>

+						</div>

 

+</section>

 	

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

 								<div class="spotlight">

 									<div class="content">

 										<header class="major">

-											<h2>SPONSORS</h2></header>

+											<h2>SPONSOR</h2></header>

 											<div class="col-md-4">

         <a href="http://mhrd.gov.in/" target="_blank"><img width=200 height=70 src="{% static 'img/mhrd.png'%}" /></a>

       </div>

@@ -348,6 +435,12 @@
 							<a style="color:white;" target="_blank" href="http://scipy.in/2015">2015</a>

 						</section>

 					</footer>

+					<div class="container">

+            <center><img src="{% static 'img/fossee.png' %}" width=100 height=40>

+            <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"></a>

+                <img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></center>

+            <center>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.<center>

+ 

 

     </div>

 			</div>

diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 742cdc4..616e520 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -58,25 +58,29 @@
           </center>
           {% endif %}
  {% if user and not user.is_anonymous and not login_required %}
-  <span><h2><u>Important Dates</u></h2></span>
-                 
+  <p>We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 30 minutes and for workshops is 2 to 4 (max) hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
+</p>
+                  <span><h2><u>Important Dates</u></h2></span>
              <ul>
-                <li>CFP Open: To be announced
-                <li>CFP Close: To be announced
+                <li>Call for proposals opens: 4 October 2016</li>
+                <li>Last date for submission of proposals: To be announced
                 <li>Announcement of selected proposals: To be announced
             </ul>
+
             <br>
       {% if user.is_superuser %}
         <center><a href="{% url 'website:view_abstracts' %}" style="background:#D44727" class="button special">View Proposals</a> </center>
         {% else %}
-                <center>
+               <!--  <center>
                 <a href="{% url 'website:submitcfp' %}" style="background:#D44727" class="button special">Submit an Abstract</a> 
                 <a href="{% url 'website:submitcfw' %}" style="background:#D44727" class="button special">Submit a Workshop</a>  
                 <a href="{% url 'website:view_abstracts' %}" style="background:#D44727" class="button special">View Proposals</a>
-                </center>
+                </center> -->
         {% endif %}
                
       {% else %}
+      <p align = "justify">We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 (max) hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
+</p><hr>
       <ul class="features">
 <li>
                  <span><h2><u>Login</u></h2></span>
@@ -102,11 +106,12 @@
                 <!-- </div> -->
 
             <!-- <div class="col-md-6" > -->
+            
 <li>
                   <span><h2><u>Important Dates</u></h2></span>
              <ul>
-                <li>CFP Open: To be announced
-                <li>CFP Close: To be announced
+                <li>Call for proposal opens: 4 October 2016</li>
+                <li>Last date for submission of proposals: To be announced
                 <li>Announcement of selected proposals: To be announced
             </ul>
 </li>
diff --git a/website/templates/submit-cfp.html b/website/templates/submit-cfp.html
index 426bfa1..b856a07 100755
--- a/website/templates/submit-cfp.html
+++ b/website/templates/submit-cfp.html
@@ -20,7 +20,7 @@
       {% block header %}
        <header id="header1">
             <h1>SciPy India 2016</h1>
-            <h2>Submit Workshop Proposal</h2>
+            <h2>Submit Abstract Proposal</h2>
 </header> 
 {% endblock %}
 
@@ -65,7 +65,6 @@
 
         <!-- <h2>{{ user.get_full_name|default:user.username }} </h2> -->
         <h2><u>Proposal Guidelines</u></h2>
-        <li>To be announced</li><br>
              <ul>
                 <li>The project you are willing to present should be an actual implementation rather than just an idea.
                 <li>Abstract should be of 300 to 700 words describing the topic, including its relevance to scientific computing.
diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html
index ef8607f..f5dbc77 100755
--- a/website/templates/submit-cfw.html
+++ b/website/templates/submit-cfw.html
@@ -77,15 +77,19 @@
             </ul>
         <form  action="" method=POST enctype="multipart/form-data">
 
-          <div class="row1">
-          {% for field in proposal_form %} 
+<!--           <div class="row1">
+ -->          {% for field in proposal_form %} 
                   <p>{{ field.label}}
                    {% if field.field.required %} <span style="color:red;">*</span> {% endif %}
                     {{ field }}</p>
                      <a style="color:red; ">{{ field.errors }}</a>
                   {% endfor %}
-          </div>
+          <!-- </div> -->
           {% csrf_token %}
+          {% if form.error %}
+
+          Auch
+          {% endif %}
         <center><button class="button special" style="background:#D44727" type="submit">Submit</button></center>
         
               </section>