Changes of links to 2016

20 files changed, 53 insertions, 132 deletions

diff --git a/scipy2016/__init__.pyc b/scipy2016/__init__.pyc
deleted file mode 100644
index 646985b..0000000
--- a/scipy2016/__init__.pyc
+++ /dev/null
diff --git a/scipy2016/settings.py b/scipy2016/settings.py
index cc52cfa..9d4155b 100755
--- a/scipy2016/settings.py
+++ b/scipy2016/settings.py
@@ -40,6 +40,9 @@ INSTALLED_APPS = (
     'website',
     'social.apps.django_app.default',
     'widget_tweaks',
+    'crispy_forms',
+    'floppyforms',
+    'captcha',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -118,6 +121,9 @@ LOCAL_SOCIAL_AUTH_GITHUB_SECRET = 'cd1b070917d0a5c8cd27ef997fd353a4'
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
 
+RECAPTCHA_PUBLIC_KEY = '76wtgdfsjhsydt7r5FFGFhgsdfytd656sad75fgh'
+RECAPTCHA_PRIVATE_KEY = '6LcVu9ESAAAAAGxz7aEIACWRa3CVnXN3mFd-cajP'
+
 LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'UTC'
diff --git a/scipy2016/settings.pyc b/scipy2016/settings.pyc
deleted file mode 100644
index 9a7acb8..0000000
--- a/scipy2016/settings.pyc
+++ /dev/null
diff --git a/scipy2016/urls.pyc b/scipy2016/urls.pyc
deleted file mode 100644
index 6daec6d..0000000
--- a/scipy2016/urls.pyc
+++ /dev/null
diff --git a/scipy2016/wsgi.py b/scipy2016/wsgi.py
index e8c8013..8a257db 100755
--- a/scipy2016/wsgi.py
+++ b/scipy2016/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for online_test project.
+WSGI config for scipy2016 project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -8,25 +8,7 @@ https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
 """
 
 import os
-import sys
-
-
-sys.path.insert(0, '/Site/scipy_in_2016/scipy/scipy2016')
-sys.path.insert(1, '/Site/scipy_in_2016/scipy')
-sys.path.insert(2, '/Site/scipy_in_2016/scipy_env/lib/python2.7/site-packages')
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scipy2016.settings")
-activate_this = '/Site/scipy_in_2016/scipy_env/bin/activate_this.py'
 
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
diff --git a/scipy2016/wsgi.pyc b/scipy2016/wsgi.pyc
deleted file mode 100644
index 798bf1f..0000000
--- a/scipy2016/wsgi.pyc
+++ /dev/null
diff --git a/uploads/usha/attachment/ushapdf.pdf b/uploads/usha/attachment/ushapdf.pdf
deleted file mode 100644
index 78260eb..0000000
--- a/uploads/usha/attachment/ushapdf.pdf
+++ /dev/null
diff --git a/website/__init__.pyc b/website/__init__.pyc
deleted file mode 100644
index 647354d..0000000
--- a/website/__init__.pyc
+++ /dev/null
diff --git a/website/admin.pyc b/website/admin.pyc
deleted file mode 100644
index 3a3c1a0..0000000
--- a/website/admin.pyc
+++ /dev/null
diff --git a/website/forms.pyc b/website/forms.pyc
deleted file mode 100644
index 7596b4f..0000000
--- a/website/forms.pyc
+++ /dev/null
diff --git a/website/models.pyc b/website/models.pyc
deleted file mode 100644
index df394eb..0000000
--- a/website/models.pyc
+++ /dev/null
diff --git a/website/static/css/main.css b/website/static/css/main.css
index 4fee9fc..f12f6c3 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -2748,6 +2748,7 @@
 
 		table td {
 			padding: 0.75em 0.75em;
+			text-align: justify;
 		}
 
 		table th {
diff --git a/website/templates/abstract-details.html b/website/templates/abstract-details.html
index 9ee8331..d42dbbf 100755
--- a/website/templates/abstract-details.html
+++ b/website/templates/abstract-details.html
@@ -40,7 +40,7 @@
                <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
                <ul class="dropdown-menu">
-                   <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+                   <li><a href="{% url 'auth:logout'?%}?next=/2016/cfp">Logout</a></li>
                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
                </ul>   
                {% else %}       
diff --git a/website/templates/base.html b/website/templates/base.html
index 3f0d30b..033745c 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -7,12 +7,8 @@
     	<title>SciPy India 2016</title>

 		<meta charset="utf-8" />

 		<meta name="viewport" content="width=device-width, initial-scale=1" />

-		<script src="{% static 'js/ie/html5shiv.js' %}"></script>

 		<link rel="stylesheet" href="{% static 'css/main.css'%}" />

-		<link rel="stylesheet" href="{% static 'css/fileuploader.css'%}" />

 		<link href="{% static 'css/base.css' %}" rel="stylesheet">

-		<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">

-		<link href="{% static 'css/bootstrap-social.css' %}" rel="stylesheet">

 	</head>	

 	<body>

 

@@ -25,14 +21,14 @@
 						<h1 >SciPy India 2016</h1>

 						<p style="color:#484848; font-weight:700; font-size:28px;" >DECEMBER 10 & 11</p><br><br>

             			

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

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

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

-            	  <!-- <a href="#callforabstract" class="button special" style="width : 220px;" >Propose Workshop</a></center> -->

 					</header>

 {% endblock %}

 

 

-<body data-spy="scroll" data-offset="0" data-target="#navbar-main">

+

+<body data-spy="scroll" data-offset="1" data-target="#navbar-main">

 

 {% block nav %}

 <div id="navbar-main"> 

@@ -40,7 +36,7 @@
   <div class="navbar navbar-inverse navbar-fixed-top">

       <div class="navbar-collapse collapse">

         <ul class="nav navbar-nav">

-          <li> <a href="#" class="smoothScroll">Home</a></li>

+          <li> <a href="#header" class="smoothScroll">Home</a></li>

           <li> <a href="#about" class="smoothScroll">About</a></li>

           <li> <a href="#speakers" class="smoothScroll">Speakers</a></li>

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

@@ -53,7 +49,7 @@
                <li class="dropdown">

                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>

                <ul class="dropdown-menu">

-                   <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>

+                   <li><a href="{% url 'auth:logout' %}">Logout</a></li>

                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>

                </ul>   

                {% else %}       

@@ -101,7 +97,7 @@
     </colgroup>

 <tr>

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

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

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

@@ -121,66 +117,6 @@
 </tr>

 		</table>

 				

-				

-					<!-- <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">

-						<!-- Wrapper for slides 

-						<div class="carousel-inner">

-							<div class="item active centered">

-							<table class="tile_table">

-              				  <tr>

-                			    <td>

-								<img class="img-responsive" src="{% static 'img/c1.png' %}" alt="">

-								</td>

-								<td>

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

-									Information about the person. His topic or anythhin related to. Filed of work etc.

-									<p></p>

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

-									&nbsp;&nbsp;&nbsp;&nbsp;

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

-

-								</td>

-							</tr>

-						</table>

-

-							</div>

-							<div class="item centered">

-								<table class="tile_table">

-              				  <tr>

-                			    <td>

-								<img class="img-responsive" src="{% static 'img/c2.png' %}" alt="">

-								</td>

-								<td>

-									<p>PQR UVW</p>

-									<hr>

-									Information about the person. His topic or anythhin related to talk. Filed of work etc.

-

-								</td>

-							</tr>

-						</table>

-							</div>

-							<div class="item centered">

-								<table class="tile_table">

-              				  <tr>

-                			    <td>

-								<img class="img-responsive" src="{% static 'img/c3.png' %}" alt="">

-								</td>

-								<td>

-									<p>ABC XYZ</p>

-									<hr>

-									Information about the person. His topic or anythhin related to talk. Filed of work etc.

-

-								</td>

-							</tr>

-						</table>

-							</div>

-						</div>

-						<ol class="carousel-indicators">

-						    <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>

-						    <li data-target="#carousel-example-generic" data-slide-to="1"></li>

-						    <li data-target="#carousel-example-generic" data-slide-to="2"></li>

-						</ol>

-					</div> -->

 				</div>

 			

 			</div>

@@ -193,7 +129,6 @@
 									<h2>ATTEND</h2>

  								</header>

 

-							<!-- <div style="overflow-x:auto;"> -->

 								<table >

 									 <colgroup>

         							 <col width="20%" />

@@ -201,12 +136,10 @@
 

 									    </colgroup>

 									<tr>

-										<center>

 								<td bgcolor="#efa8b0">

 										<h9 style="color:white;">Early Bird</h9>

 										<h2 style="color:white;" style ="font-size: 25px;">&#8377;1000</h2>

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

@@ -219,8 +152,6 @@
 										<h9 style="color:white;">Light</h9>

 										<h2  style="color:white;"style ="font-size: 25px;">&#8377;600</h2>

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

@@ -231,8 +162,6 @@
 										<h9 style="color:white;">Regular</h9>

 										<h2 style="color:white;" style ="font-size: 25px;">&#8377;1200</h2>

 										<h9 style="color:white;">(10 Nov - 30 Nov 2016)</h9>

-									<!-- </li> -->

-								<!-- </ul> -->

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

@@ -240,7 +169,7 @@
 								<tr>

 								<td bgcolor ="#9bb2e1">

 										<h9 style="color:white;">Accomodation</h9>

-										<h2 style="color:white;" style ="font-size: 25px;">&#8377;750</h2>

+										<h2 style="color:white;" style ="font-size: 25px;">&#8377;500</h2>

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

@@ -248,37 +177,20 @@
 								<tr>

 								<td bgcolor= "#8cc9f0">

 										<h9 style="color:white;">T-Shirt</h9>

-										<h2 style="color:white;" style ="font-size: 25px;">&#8377;250</h2>

+										<h2 style="color:white;" style ="font-size: 25px;">&#8377;350</h2>

 								</td>

 								<td>

 									Change of size, exchange at the venue is not available. This is a non-refundable ticket.

 									</td>

 								</tr>

 							</tr>

-							<!-- <tr>

-								<!-- </ul>

-							</center>

-									

-									<td>

-									This Ticket allows you to ONLY attend the conference for 3 Days. Does not include any conference amenities (Accommodation, Kit, Food & T-shirt). This is a non-refundable ticket.

-									</td>

-									<td>

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

-									</td>

-									<td>

-									Change of size, exchange at the venue is not available. This is a non-refundable ticket.

-									</td>

-									<td>

-									Accommodation is provided on a shared basis (twin sharing) inside IIT-B campus (Boys/Girls hostel). Accommodation will be provided for 3 days, i.e, 13-14, 14-15 and 15-16 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>

- -->

+							

 							</table>

 								

 								<p id="demo"></p>

 								<footer class="major">

 									<ul class="actions">

-										<li><input type= "image" href="#" style="height:40px;width:180px;" src="{% static 'img/register.png'%}"></li>

+										<li><input type= "image" href="#" src="{% static 'img/register.png'%}"></li>

 									</ul>

 								</footer>

 							</section>

@@ -449,7 +361,7 @@
 											<h2>VENUE</h2>	

 											<center><h4>Lecture Hall Complex, IIT Bombay</h4></center>

 												<!-- <div class='myIframe' >  -->

-                    <iframe  src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3769.472585331343!2d72.916895!3d19.130779999999994!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3be7c7f4215f57bf%3A0xcf0c03ea45a113e1!2sLecture+Hall+Complex+(LHC)!5e0!3m2!1sen!2sin!4v1434726932900" width="550" height="300" frameborder="0" style="border:0"></iframe>

+                    <iframe  src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3769.472585331343!2d72.916895!3d19.130779999999994!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3be7c7f4215f57bf%3A0xcf0c03ea45a113e1!2sLecture+Hall+Complex+(LHC)!5e0!3m2!1sen!2sin!4v1434726932900" width="650" height="450" frameborder="0" style="border:0"></iframe>

                 <!-- </div> -->

                 </section>

 

@@ -467,7 +379,8 @@
       <div class="col-md-8">

         <p align="justify">The <a href="http://fossee.in/" target="_blank">FOSSEE</a> project undertaken by IIT Bombay is funded by <a href="http://mhrd.gov.in/" target="_blank">Ministry of Human Resource Development</a> (Govt. of India) under National Mission on Education through ICT. The essence of Human Resource Development is education, which plays a significant and remedial role in balancing the socio-economic fabric of the Country. Since citizens of India are its most valuable resource, our billion-strong nation needs the nurture and care in the form of basic education to achieve a better quality of life.</p><br><br>

       </div>

-      <center><h3>Organiser</h3></center>

+     <header class="major">

+		<h2>ORGANISER</h2></header>

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

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

       </div>

@@ -500,7 +413,8 @@
 							<input placeholder = "Answer" class="form-control" type="text" id="b"/>

 							</div>

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

-							<button class="button" href="" id = "c" type="submit">Send Message</button>

+							<!-- <button class="button" href="" id = "c" type="submit">Send Message</button> -->

+							<button id="myButton">Send Message</button>

 							</div>

 						</form>

 						</section>

@@ -510,7 +424,7 @@
 							<h2>Contact Us</h2>

 							<dl class="alt">

 								<dt>Address</dt>

-								<dd> &bull; CFD - Lab, Aero. Annex Building,<br>&bull; Below HSS Dept.,<br> &bull; Opp.Metallurgical Dept.IIT Bombay,<br> &bull; Powai, Mumbai - 400076 India</dd>

+								<dd> CFD - Lab, Aero. Annex Building,<br> Below HSS Dept.,<br>  Opp.Metallurgical Dept.IIT Bombay,<br> Powai, Mumbai - 400076<br>India</dd>

 								<dt>Phone</dt>

 								<dd> (+91) 22 25764133</dd>

 								<dt>Email</dt>

@@ -518,11 +432,10 @@
 </a></dd>

 							</dl>

 							<ul class="icons">

-								<li><a style="color:white;" href="#" class="icon-twitter alt"><span class="label"></span></a></li>

-								<li><a style="color:white;" href="#" class="icon-facebook alt"><span class="label"></span></a></li>

-								<li><a style="color:white;" href="#" class="icon-instagram alt"><span class="label"></span></a></li>

-								<li><a style="color:white;" href="#" class="icon-github alt"><span class="label"></span></a></li>

-								<li><a style="color:white;" href="#" class="icon-dribbble alt"><span class="label"></span></a></li>

+								<li><a style="color:white;" target="_blank" href="https://twitter.com/scipyindia" class="icon-twitter alt"><span class="label"></span></a></li>

+								<li><a style="color:white;" target="_blank" href="https://www.facebook.com/scipydotin" class="icon-facebook alt"><span class="label"></span></a></li>

+								<li><a style="color:white;" target="_blank" href="https://plus.google.com/+ScipyIndia/posts" class="icon-google-plus alt"><span class="label"></span></a></li>

+

 							</ul>

 							Visit SciPy.in/ <a style="color:white;" href="">2009</a>/

 							<a style="color:white;" target="_blank" href="">2010</a>/

@@ -551,6 +464,7 @@
 			<script src="{% static 'js/bootstrap.min.js' %}"></script>

 			<script src="{% static 'js/smoothscroll.js' %}"></script>

 

+<!-- 

 <script>

 $(document).ready(function() {

     var n1 = Math.round(Math.random() * 10 + 1);

@@ -564,5 +478,23 @@ $(document).ready(function() {
     });

 });

 </script>

+ -->

+

+<script type="text/javascript">

+window.onload = function () {

+	var n1 = Math.round(Math.random() * 10 + 1);

+    var n2 = Math.round(Math.random() * 10 + 1);

+    $("#a").val(n1 + " + " + n2 + " = ");

+    document.getElementById("myButton").onclick = function () {

+         if (eval($("#a").val()) == $("#b").val()) {

+         	return true;

+         	alert("!")

+        } else {

+            alert("Write the correct value ");

+            return false;

+        }

+    }

+}</script>

+

 	</body>

 </html>
\ No newline at end of file
diff --git a/website/templates/comment-abstract.html b/website/templates/comment-abstract.html
index fd00256..bdd919b 100755
--- a/website/templates/comment-abstract.html
+++ b/website/templates/comment-abstract.html
@@ -31,7 +31,7 @@
                <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
                <ul class="dropdown-menu">
-                   <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+                   <li><a href="{% url 'auth:logout'%}?next=/2016/cfp">Logout</a></li>
                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
                </ul>   
                {% else %}       
@@ -45,6 +45,7 @@
 {% endblock %}
 
 {% block content %}
+
 			<div id="wrapper">
 			<div id="main">
 			<section id="content" class="main">
@@ -145,7 +146,6 @@ mySubmitButton.onclick = function() {
 }</script>
 
 
-
 <script>
 $(document).ready(function() {
     var n1 = Math.round(Math.random() * 10 + 1);
diff --git a/website/templates/submit-cfp.html b/website/templates/submit-cfp.html
index 2a415a9..e3c1c2c 100755
--- a/website/templates/submit-cfp.html
+++ b/website/templates/submit-cfp.html
@@ -40,7 +40,7 @@
                <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
                <ul class="dropdown-menu">
-                   <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+                   <li><a href="{% url 'auth:logout'%}?next=/2016/cfp">Logout</a></li>
                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
                </ul>   
                {% else %}       
diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html
index f31ea9b..8de96ca 100755
--- a/website/templates/submit-cfw.html
+++ b/website/templates/submit-cfw.html
@@ -40,7 +40,7 @@
                <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
                <ul class="dropdown-menu">
-                   <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+                   <li><a href="{% url 'auth:logout'%}?next=/2016/cfp">Logout</a></li>
                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
                </ul>   
                {% else %}       
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 5d64f05..5f7685a 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -38,7 +38,7 @@
                <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
                <ul class="dropdown-menu">
-                   <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+                   <li><a href="{% url 'auth:logout'%}?next=/2016/cfp">Logout</a></li>
                    <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
                </ul>   
                {% else %}       
diff --git a/website/urls.pyc b/website/urls.pyc
deleted file mode 100644
index a41a5ee..0000000
--- a/website/urls.pyc
+++ /dev/null
diff --git a/website/views.pyc b/website/views.pyc
deleted file mode 100644
index cddb2b3..0000000
--- a/website/views.pyc
+++ /dev/null