summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscipy2016/settings.py2
-rwxr-xr-xwebsite/templates/abstract-details.html6
-rwxr-xr-xwebsite/templates/base.html44
-rwxr-xr-xwebsite/templates/cfp.html20
-rwxr-xr-xwebsite/templates/comment-abstract.html2
-rw-r--r--website/templates/edit-proposal.html7
-rwxr-xr-xwebsite/templates/register/password_change_done.html1
-rwxr-xr-xwebsite/templates/register/password_change_form.html1
-rwxr-xr-xwebsite/templates/register/password_reset_complete.html1
-rwxr-xr-xwebsite/templates/register/password_reset_confirm.html1
-rwxr-xr-xwebsite/templates/register/password_reset_done.html1
-rwxr-xr-xwebsite/templates/register/password_reset_form.html1
-rwxr-xr-xwebsite/templates/submit-cfp.html14
-rwxr-xr-xwebsite/templates/submit-cfw.html23
-rwxr-xr-xwebsite/views.py2
15 files changed, 66 insertions, 60 deletions
diff --git a/scipy2016/settings.py b/scipy2016/settings.py
index c307bf0..2789139 100755
--- a/scipy2016/settings.py
+++ b/scipy2016/settings.py
@@ -24,6 +24,8 @@ SECRET_KEY = 'w81ia+6)sak!)t@kv=@x267y78ceh4iu2c@o@2#8+h$kua3e9a'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
+
TEMPLATE_DEBUG = True
ALLOWED_HOSTS = []
diff --git a/website/templates/abstract-details.html b/website/templates/abstract-details.html
index 22c1d56..42c5d59 100755
--- a/website/templates/abstract-details.html
+++ b/website/templates/abstract-details.html
@@ -1,12 +1,11 @@
+<!DOCTYPE HTML>
{% extends 'base.html' %}
{% load static %}
-<!DOCTYPE HTML>
<html>
<head>
<title>{{ user.get_full_name|default:user.username }}</title>
<meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="assets/css/main.css" />
</head>
<body>
@@ -22,7 +21,6 @@
-<div id="wrapper">
{% block nav %}
<div id="navbar-main">
@@ -74,7 +72,7 @@
</section>
</div>
-
+ </div>
{% endblock %}
diff --git a/website/templates/base.html b/website/templates/base.html
index 35f237b..e4e927b 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -1,6 +1,6 @@
+<!DOCTYPE HTML>
{% load static %}
-<!DOCTYPE HTML>
<html>
<head>
<link rel="icon" href="{% static 'img/favicon.ico'%}" type="icon">
@@ -13,7 +13,7 @@
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
</head>
- <body>
+ <body data-spy="scroll" data-offset="1" data-target="#navbar-main">
<!-- Wrapper -->
<div id="wrapper">
@@ -22,7 +22,7 @@
<header id="header" class="alt">
<span class="logo"><img src="{% static 'img/logo.png' %}" alt="" /></span>
<h1 >SciPy India 2016</h1>
- <p style="color:#484848; font-weight:700; font-size:28px;" >DECEMBER 10 & 11</p><br><br>
+ <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</a>
@@ -31,8 +31,6 @@
-<body data-spy="scroll" data-offset="1" data-target="#navbar-main">
-
{% block nav %}
<div id="navbar-main">
<!-- Fixed navbar -->
@@ -79,7 +77,7 @@
<div class="spotlight">
<div class="content">
<header class="major">
- <h2>SPEAKERS</h2>
+ <h2>SPEAKERS</h2></header>
<table>
@@ -146,7 +144,7 @@
<td bgcolor = "#c79cc8">
<h9 style="color:white;">Light</h9>
- <h2 style="color:white;"style ="font-size: 25px;">&#8377;600</h2>
+ <h2 style="color:white; font-size: 25px;">&#8377;600</h2>
<h9 style="color:white;">(Till 30 Nov 2016)</h9>
</td>
<td>
@@ -158,7 +156,7 @@
<tr>
<td bgcolor="#a89cc8">
<h9 style="color:white;">Regular</h9>
- <h2 style="color:white;" style ="font-size: 25px;">&#8377;1400</h2>
+ <h2 style="color:white; font-size: 25px;">&#8377;1400</h2>
<h9 style="color:white;">(10 Nov - 30 Nov 2016)</h9>
</td>
<td>
@@ -168,7 +166,7 @@
<tr>
<td bgcolor ="#9bb2e1">
<h9 style="color:white;">Accomodation</h9>
- <h2 style="color:white;" style ="font-size: 25px;">&#8377;500</h2>
+ <h2 style="color:white; font-size: 25px;">&#8377;500</h2>
<h9 style="color:white;"><a href="https://scipyindia2016.doattend.com/get_addons"> Add On </a></h9>
</td>
<td>
@@ -178,7 +176,7 @@
<tr>
<td bgcolor= "#8cc9f0">
<h9 style="color:white;">T-Shirt</h9>
- <h2 style="color:white;" style ="font-size: 25px;">&#8377;350</h2>
+ <h2 style="color:white; font-size: 25px;">&#8377;350</h2>
<h9 style="color:white;"><a href="https://scipyindia2016.doattend.com/get_addons"> Add On </a></h9>
</td>
<td>
@@ -204,14 +202,13 @@
<div class="content">
<header class="major">
<h2>CODE OF CONDUCT</h2> </header>
- <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 id="coc" name="coc">
+ <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>
@@ -287,7 +284,7 @@
<section id="schedule" class="main special">
<div class="spotlight">
<div class="content">
- <header class="major">
+ <header class="major"></header>
<h2>SCHEDULE</h2>
<div id="schedule" name="schedule">
<div >
@@ -299,7 +296,7 @@
<!--<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>
- --><br><br>
+ --><br/><br/>
</ul>
<div class="tab-content">
<div id="day1" class="tab-pane fade in active">
@@ -317,8 +314,7 @@
<p></p>
</div>
<div id="day2" class="tab-pane fade">
- <p>
- </p><center><h4>11 Dec 2016: Day 2</h4></center>
+ <p></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>
@@ -342,7 +338,7 @@
<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="650" height="450" frameborder="0" style="border:0"></iframe>
- </div/>
+ </div></div></div>
</section>
@@ -368,7 +364,7 @@
<a href="http://mhrd.gov.in/" target="_blank"><img width=200 height=70 src="{% static 'img/mhrd.png'%}" /></a>
</div>
<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>
+ <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>
<header class="major">
<h2>ORGANISER</h2></header>
@@ -377,7 +373,7 @@
</div>
<div class="col-md-8">
<p align="justify">The Annual SciPy India conference is organised by the team members of FOSSEE project which is part of the National Mission on Education through ICT with the thrust area being Adaptation and deployment of open source simulation packages equivalent to proprietary software, funded by MHRD, based at the Indian Institute of Technology Bombay (IITB).</p>
- </div>
+ </div></div></div>
</section>
</div>
{% endblock %}
@@ -394,9 +390,9 @@
<div class="col-md-6 form-group">
<input class="form-control" id="email" name="email" placeholder="Email" type="email" required />
</div>
- <br><br>
+ <br/><br/>
<textarea class="form-control" id="message" name="message" placeholder="Message" rows="5"></textarea>
- <br>
+ <br/>
<div class = "col-md-3">
<input class="form-control" style="color:black;" readonly type="text" id="a" />
</div>
@@ -442,10 +438,10 @@
<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 target="_blank" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.<center>
- <br>
+ <br/>
</div>
- </div>
+
<!-- end wrapper -->
{% endblock %}
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 0ab52e5..9f4c533 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -1,7 +1,7 @@
+<!DOCTYPE HTML>
{% extends 'base.html' %}
{% load static %}
-<!DOCTYPE HTML>
<html>
<head>
<title>Submit Proposal</title>
@@ -63,7 +63,7 @@
<center>
<p>Thank You for your registration. You can now log in by clicking <a href="{% url 'website:cfp' %}">here </a>!</p>
- <br><br>
+ <br/><br/>
</center>
{% endif %}
@@ -75,11 +75,11 @@
<span><h2><u>Important Dates</u></h2></span>
<ul>
<li>Call for proposals opens: <b>October 4, 2016</b></li>
- <li>Last date for submission of proposals: To be announced
- <li>Announcement of selected proposals: To be announced
+ <li>Last date for submission of proposals: <b>November 20, 2016</b></li>
+ <li>Announcement of selected proposals: <b>December 1, 2016</b></li>
</ul>
- <br>
+ <br/>
{% if user.is_superuser %}
<center><a href="{% url 'website:view_abstracts' %}" style="background:#D44727" class="button special">View Proposals</a> </center>
{% else %}
@@ -105,7 +105,7 @@
<!-- <div id = "my_form"> -->
<form action="" method="POST">
{{ form.as_p }}
- <button class="button special" style="background:#D44727" name ="login"type="submit">Login</button><br><br>
+ <button class="button special" style="background:#D44727" name ="login" type="submit">Login</button><br/><br/>
<a style="padding-right : 20px;" href="{% url 'website:userregister' %}" class="btn btn btn-primary">Create an Account</a>
<a href="/2016/forgotpassword/">Forgot Password?</a>
{% csrf_token %}
@@ -115,6 +115,7 @@
<a href="{% url 'social:begin' 'google-oauth2' %}" class="btn btn-social-icon " style="color:#dd4b39;"><i class="icon-google-plus"></i></a>&nbsp;
<a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}" class=" btn btn-social-icon" style="color:#3b5998"><i class="icon-facebook"></i></a></p>
</li>
+
<!-- </div> -->
<!-- <div class="col-md-6" > -->
@@ -123,10 +124,11 @@
<span><h2><u>Important Dates</u></h2></span>
<ul>
<li>Call for proposal opens: <b>October 4, 2016</b></li>
- <li>Last date for submission of proposals: To be announced
- <li>Announcement of selected proposals: To be announced
+ <li>Last date for submission of proposals: <b>November 20, 2016</b></li>
+ <li>Announcement of selected proposals: <b>December 1, 2016</b></li>
</ul>
</li>
+ </ul>
<!-- </div> -->
{% endif %}
@@ -137,4 +139,4 @@
{% endblock %}
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/website/templates/comment-abstract.html b/website/templates/comment-abstract.html
index 8475e72..27b1837 100755
--- a/website/templates/comment-abstract.html
+++ b/website/templates/comment-abstract.html
@@ -112,7 +112,7 @@
<form action="{% url 'website:comment_abstract' proposal.id %}" method='POST' enctype="multipart/form-data">
{% csrf_token %}
<textarea rows="5" cols="100" id="comment" class= "comment" name="comment" placeholder = "Add commnet here..."></textarea><br>
- <input class="button special" style="background:#d44727" type="submit" class="button" value="Comment">
+ <input class="button special" style="background:#d44727" type="submit" value="Comment">
</form>
<!-- <form action="{% url 'website:status' proposal.id %}" method='POST'>{% csrf_token %}
diff --git a/website/templates/edit-proposal.html b/website/templates/edit-proposal.html
index 3201291..8eb332e 100644
--- a/website/templates/edit-proposal.html
+++ b/website/templates/edit-proposal.html
@@ -1,8 +1,7 @@
+<!DOCTYPE HTML>
{% extends 'base.html' %}
{% load static %}
-<!DOCTYPE HTML>
-
<html>
<head>
<title>{{ user.get_full_name|default:user.username }}</title>
@@ -68,4 +67,6 @@
</div>
-{% endblock %} \ No newline at end of file
+{% endblock %}
+</body>
+</html> \ No newline at end of file
diff --git a/website/templates/register/password_change_done.html b/website/templates/register/password_change_done.html
index a5b771c..8898325 100755
--- a/website/templates/register/password_change_done.html
+++ b/website/templates/register/password_change_done.html
@@ -19,7 +19,6 @@
</header>
{% endblock %}
-<div id="wrapper">
{% block nav %}
diff --git a/website/templates/register/password_change_form.html b/website/templates/register/password_change_form.html
index c3254ba..768747e 100755
--- a/website/templates/register/password_change_form.html
+++ b/website/templates/register/password_change_form.html
@@ -22,7 +22,6 @@
</header>
{% endblock %}
-<div id="wrapper">
{% block nav %}
diff --git a/website/templates/register/password_reset_complete.html b/website/templates/register/password_reset_complete.html
index ef6496f..d40a508 100755
--- a/website/templates/register/password_reset_complete.html
+++ b/website/templates/register/password_reset_complete.html
@@ -22,7 +22,6 @@
</header>
{% endblock %}
-<div id="wrapper">
{% block nav %}
diff --git a/website/templates/register/password_reset_confirm.html b/website/templates/register/password_reset_confirm.html
index db880b7..3329325 100755
--- a/website/templates/register/password_reset_confirm.html
+++ b/website/templates/register/password_reset_confirm.html
@@ -22,7 +22,6 @@
</header>
{% endblock %}
-<div id="wrapper">
{% block nav %}
diff --git a/website/templates/register/password_reset_done.html b/website/templates/register/password_reset_done.html
index 723f43b..b3cb144 100755
--- a/website/templates/register/password_reset_done.html
+++ b/website/templates/register/password_reset_done.html
@@ -22,7 +22,6 @@
</header>
{% endblock %}
-<div id="wrapper">
{% block nav %}
diff --git a/website/templates/register/password_reset_form.html b/website/templates/register/password_reset_form.html
index 3075735..75c0fbd 100755
--- a/website/templates/register/password_reset_form.html
+++ b/website/templates/register/password_reset_form.html
@@ -22,7 +22,6 @@
</header>
{% endblock %}
-<div id="wrapper">
{% block nav %}
diff --git a/website/templates/submit-cfp.html b/website/templates/submit-cfp.html
index d44c408..e39d747 100755
--- a/website/templates/submit-cfp.html
+++ b/website/templates/submit-cfp.html
@@ -25,7 +25,6 @@
{% endblock %}
-<div id="wrapper">
{% block nav %}
<div id="navbar-main">
@@ -66,12 +65,13 @@
<!-- <h2>{{ user.get_full_name|default:user.username }} </h2> -->
<h2><u>Proposal Guidelines</u></h2>
<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.
- <li>Proposals with an aim to promote a commercial product or service will be rejected.
- <li>In your abstract mention about various tools/libraries used for development.
- <li>Notification for selection/rejection of your proposal will be given through email.
- <li>All selected proposals must be presented at the conference by at least one author.
+ <li>The project you are willing to present should be an actual implementation rather than just an idea.</li>
+ <li>Submissions need not necessarily be about an implementation, they could also be about experiences and usage of Python and Python-based tools and libraries for research or teaching.</li>
+ <li>Abstract should be of 300 to 700 words describing the topic, including its relevance to scientific computing or the use of Python in education.</li>
+ <li>Proposals with an aim to promote a commercial product or service will be rejected.</li>
+ <li>In your abstract mention the various tools/libraries used for development.</li>
+ <li>Notification for selection/rejection of your proposal will be given through email.</li>
+ <li>All selected proposals must be presented at the conference by at least one author.</li>
</ul>
<form action="" method=POST enctype="multipart/form-data">
<!-- <a style="color:red; ">{{ proposal_form.errors }}</a>
diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html
index 75e8a95..ea051b5 100755
--- a/website/templates/submit-cfw.html
+++ b/website/templates/submit-cfw.html
@@ -68,12 +68,23 @@
<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>Dscription should be of 300 to 700 words describing the topic, including its relevance to scientific computing.
- <li>Proposals with an aim to promote a commercial product or service will be rejected.
- <li>In your abstract mention about various tools/libraries used for development.
- <li>Notification for selection/rejection of your proposal will be given through email.
- <li>All selected proposals must be presented at the conference by at least one author.
+ <li>Please note that there are two parallel tracks, one for beginners and one for advanced users.</li>
+ <li>Please make sure the workshops are hands-on with plenty of exercises for the users.</li>
+ <li>It is usually a good idea to pick a particular problem or set of problems and orient your workshop around how to solve those using the package you plan to talk about.</li>
+ <li>Please provide us with links to any resources you have already prepared for the workshop.</li>
+ <li>The more detail you provide on your workshop, the easier it will be for us to pick it.</li>
+ <li>Provide us with the following sections:
+ <ul>
+ <li>Duration</li>
+ <li>Track: beginner or advanced</li>
+ <li>Intended audience</li>
+ <li>Why should someone attend your workshop? What will they get at the end of it?</li>
+ <li>Outline of workshop with a reasonable breakup in terms of time.</li>
+ <li>Possibly provide any material or similar material you plan to use.</li>
+ <li>A small paragraph about you with an emphasis on your experience in the area and teaching this material. Essentially, why are you well suited to teach this workshop?</li>
+
+ </ul>
+ </li>
</ul>
<form action="" method=POST enctype="multipart/form-data">
diff --git a/website/views.py b/website/views.py
index e684d95..b45896c 100755
--- a/website/views.py
+++ b/website/views.py
@@ -322,6 +322,8 @@ def abstract_details(request, proposal_id=None):
return render(request, 'abstract-details.html', context)
else:
return render(request, 'cfp.html', context)
+ else:
+ return render(request, 'cfp.html', context)
else:
return render(request, 'cfp.html', context)
generated by cgit (git 2.34.1) at 2024-12-19 15:44:54 +0000