From bf30b60b10a54e872db9ad897b42a70725a003ae Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Thu, 25 Jun 2015 16:17:57 +0530
Subject: add guidelines & important dates for CFP

---
 scipy2015/settings.py            |  2 +-
 website/static/css/bootstrap.css |  7 ++--
 website/templates/cfp.html       | 69 +++++++++++++++++++++-------------------
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/scipy2015/settings.py b/scipy2015/settings.py
index ed1944f..3bd5ed1 100644
--- a/scipy2015/settings.py
+++ b/scipy2015/settings.py
@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
 """
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-from loacl import *
+from local import *
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
diff --git a/website/static/css/bootstrap.css b/website/static/css/bootstrap.css
index 80e0dbf..e17484a 100644
--- a/website/static/css/bootstrap.css
+++ b/website/static/css/bootstrap.css
@@ -3038,7 +3038,8 @@ input[type="button"].btn-block {
   clear: both;
   font-weight: normal;
   line-height: 1.428571429;
-  color: #333;
+  color: #3676ab;
+  font-size: 15px;
   white-space: nowrap;
 }
 .dropdown-menu > li > a:hover,
@@ -4084,8 +4085,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .navbar-inverse .navbar-nav > .open > a,
 .navbar-inverse .navbar-nav > .open > a:hover,
 .navbar-inverse .navbar-nav > .open > a:focus {
-  color: #fff;
-  background-color: #080808;
+  color: #ffca39;
+  background-color: #3676ab;
 }
 @media (max-width: 767px) {
   .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 6cfa5b4..9e7e865 100644
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -12,7 +12,14 @@
       </div>
       <div class="navbar-collapse collapse">
         <ul class="nav navbar-nav navbar-right">
-          <li><a href="{% url 'website:home' %}">Home</a></li>
+           <li><a href="{% url 'website:home' %}">Home</a></li>
+           {% if user and not user.is_anonymous %}
+               <li class="dropdown">
+               <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
+               <ul class="dropdown-menu">
+                   <li><a href="{% url 'auth:logout' %}?next={{ request.path }}">Logout</a></li>
+               </ul>           
+           {% endif %}
         </ul>
       </div>
       <!--/.nav-collapse --> 
@@ -22,38 +29,36 @@
 {% endblock %}
 
 {% block content %}
-
-<!-- ==== CONTACT ==== -->
-<div id="contact" name="contact">
+<div id="about" name="about">
   <div class="container">
-    <div class="row">
-        <div>
-             <h1>Third-party authentication demo</h1>
-             <p>
-               <ul>
-               {% if user and not user.is_anonymous %}
-                 <li>
-                   <a>Hello {{ user.get_full_name|default:user.username }}!</a>
-                 </li>
-                 <li>
-                   <a href="{% url 'auth:logout' %}?next={{ request.path }}">Logout</a>
-                 </li>
-               {% else %}
-                 <li>
-                   <a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}">Login with Facebook</a>
-                 </li>
-                 <li>
-                   <a href="{% url 'social:begin' 'google-oauth2' %}?next={{ request.path }}">Login with Google</a>
-                 </li>
-                 <li>
-                   <a href="{% url 'social:begin' 'twitter' %}?next={{ request.path }}">Login with Twitter</a>
-                 </li>
-               {% endif %}
-               </ul>
-             </p>
-         </div>
-    </div> 
+    <div class="row white">
+      <h2 class="centered">Call for Proposals</h2>
+      <hr>
+      <div class="col-md-6">
+        <p align="justify">We look forward to your proposals. Conference aims to promote <strong>Python for Scientific Computing and Education</strong>. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p>
+        <hr>
+        <h3><u>Proposal Guidelines</u></h3>
+        <ul>
+            <li>Submit a proposal through <a href="#">this link</a>
+            <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.
+        </ul>
+      </div>
+      <div class="col-md-6">
+        <h3><u>Important Dates</u></h3>
+        <ul>
+            <li>CFP Open: July 1, 2015
+            <li>CFP Close: October 15, 2015
+            <li>Announcement of selected proposals: November 15, 2015
+        </ul>
+      </div>
+    </div>
+    <!-- row --> 
   </div>
 </div>
-<!-- container -->
+
 {% endblock %}
-- 
cgit