From 0db60e6e41954338833589d12111c3f7cf294fd0 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Tue, 23 Jun 2015 17:41:09 +0530
Subject: add cfp & its reated functionalities

---
 website/templates/cfp.html | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 website/templates/cfp.html

(limited to 'website/templates/cfp.html')

diff --git a/website/templates/cfp.html b/website/templates/cfp.html
new file mode 100644
index 0000000..6cfa5b4
--- /dev/null
+++ b/website/templates/cfp.html
@@ -0,0 +1,59 @@
+{% extends 'base.html' %}
+{% load staticfiles %}
+
+{%  block navbar %}
+<div id="navbar-main"> 
+  <!-- Fixed navbar -->
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
+        <a class="navbar-brand" href="{% url 'website:home' %}">SciPy India 2015 </a>
+      </div>
+      <div class="navbar-collapse collapse">
+        <ul class="nav navbar-nav navbar-right">
+          <li><a href="{% url 'website:home' %}">Home</a></li>
+        </ul>
+      </div>
+      <!--/.nav-collapse --> 
+    </div>
+  </div>
+</div>
+{% endblock %}
+
+{% block content %}
+
+<!-- ==== CONTACT ==== -->
+<div id="contact" name="contact">
+  <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>
+</div>
+<!-- container -->
+{% endblock %}
-- 
cgit 


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

---
 website/templates/cfp.html | 69 +++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

(limited to 'website/templates/cfp.html')

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 


From 39df99f2340988e4b541769eccfffffbc430fa7f Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Fri, 3 Jul 2015 15:08:49 +0530
Subject: change for CFP

---
 website/templates/cfp.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'website/templates/cfp.html')

diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 9e7e865..8247f36 100644
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -33,6 +33,14 @@
   <div class="container">
     <div class="row white">
       <h2 class="centered">Call for Proposals</h2>
+      {% if login_required %}
+        <div class="alert alert-success" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+        <p>Thank You for submitting a Talk ! Your proposal has been saved successfully.</p>
+    </div>
+      {% endif %}
       <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>
@@ -55,6 +63,14 @@
             <li>CFP Close: October 15, 2015
             <li>Announcement of selected proposals: November 15, 2015
         </ul>
+        <hr>
+        {% if user and not user.is_anonymous %}
+            <a href="{% url 'website:submitcfp' %}" class="btn btn btn-primary" type="submit">Submit a Talk</a>
+        {% else %}
+            To Submit a Talk Login with:
+            <p><a href="{% url 'social:begin' 'google-oauth2' %}?next={{ request.path }}" class="btn btn btn-primary">Google</a> or
+            <a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}" class="btn btn btn-primary">Facebook</a> or
+        {% endif %}
       </div>
     </div>
     <!-- row --> 
-- 
cgit 


From 96c7de100fc68ad1bc31d0ca10327dddc27e4bfb Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Fri, 3 Jul 2015 15:56:17 +0530
Subject: add message

---
 website/templates/cfp.html | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'website/templates/cfp.html')

diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index 8247f36..237be4e 100644
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -32,15 +32,23 @@
 <div id="about" name="about">
   <div class="container">
     <div class="row white">
-      <h2 class="centered">Call for Proposals</h2>
+      {% if proposal_submit %}
+        <div class="alert alert-success" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+        <p>Thank You for submitting a talk. Propsal has been saved successfully !</p>
+        </div>
+      {% endif %}
       {% if login_required %}
         <div class="alert alert-success" role="alert">
         <button type="button" class="close" data-dismiss="alert" aria-label="Close">
             <span aria-hidden="true">&times;</span>
         </button>
-        <p>Thank You for submitting a Talk ! Your proposal has been saved successfully.</p>
-    </div>
+        <p>You need to login for submitting a talk !</p>
+        </div>
       {% endif %}
+      <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>
@@ -69,7 +77,7 @@
         {% else %}
             To Submit a Talk Login with:
             <p><a href="{% url 'social:begin' 'google-oauth2' %}?next={{ request.path }}" class="btn btn btn-primary">Google</a> or
-            <a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}" class="btn btn btn-primary">Facebook</a> or
+            <a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}" class="btn btn btn-primary">Facebook</a>
         {% endif %}
       </div>
     </div>
-- 
cgit