From 509bae77d1fd06ac7ed13192522cba27d96a09a2 Mon Sep 17 00:00:00 2001
From: Thomas Stephen Lee
Date: Tue, 27 Oct 2015 12:06:56 +0530
Subject: Make cfp fields optional and misc design changes

---
 website/forms.py                  |  4 ++++
 website/models.py                 | 10 +++++-----
 website/static/css/main.css       |  8 ++++++++
 website/templates/cfp.html        | 11 +++++------
 website/templates/submit-cfp.html |  1 -
 5 files changed, 22 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 website/templates/cfp.html
 mode change 100644 => 100755 website/templates/submit-cfp.html

diff --git a/website/forms.py b/website/forms.py
index fc828f8..cd7b73a 100644
--- a/website/forms.py
+++ b/website/forms.py
@@ -9,6 +9,10 @@ from website.models import Proposal
 
 
 class ProposalForm(forms.ModelForm):
+    content_link = forms.CharField(required=False, help_text='Link to the content of your Talk')
+    speaker_link = forms.CharField(required=False, help_text='Link to information about the Speaker')
+    attachment = forms.FileField(required=False)
+
     class Meta:
         model = Proposal
         exclude = ('user', )
diff --git a/website/models.py b/website/models.py
index e5eb78c..15c6044 100644
--- a/website/models.py
+++ b/website/models.py
@@ -9,11 +9,11 @@ def get_document_dir(instance, filename):
 
 class Proposal(models.Model):
     user = models.ForeignKey(User)
-    title = models.CharField(max_length=1024)
-    abstract = models.TextField(max_length=1024)
-    content_link = models.CharField(max_length=1024)
-    speaker_link = models.CharField(max_length=1024)
-    bio = models.TextField(max_length=512)
+    title = models.CharField(max_length=1024, help_text='Title of your Talk')
+    abstract = models.TextField(max_length=1024, help_text='Abstract of your Talk')
+    content_link = models.CharField(max_length=1024, help_text='Link to the content of your Talk')
+    speaker_link = models.CharField(max_length=1024, help_text='Link to information about the Speaker')
+    bio = models.TextField(max_length=512, help_text='A short description about you')
     attachment = models.FileField(upload_to=get_document_dir)
     date_created = models.DateTimeField(auto_now_add=True)
     date_modified = models.DateTimeField(auto_now=True)
diff --git a/website/static/css/main.css b/website/static/css/main.css
index cbe1813..907b86d 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -613,4 +613,12 @@ body .header {
 
 #about img {
     margin-top: 10%;
+} 
+
+.errorlist
+{
+font-size:14px;
+color:red;
+text-align:center;
+ list-style-type: none;
 }
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
old mode 100644
new mode 100755
index 411a160..d4f1e04
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -36,7 +36,7 @@
           <center>
             <div class="alert" style="width:700px;height:50px;">
                 <a class="close" data-dismiss="alert" href="#">&times;</a>
-                <p>Thank You for submitting a talk. Propsal has been saved successfully !</p>
+                <p>Thank You for submitting a talk. Proposal has been saved successfully !</p>
             </div>
           </center>
           <div class="clearfix"></div>
@@ -84,7 +84,6 @@
             <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.
@@ -97,17 +96,17 @@
             <h3><u>Important Dates</u></h3>
             <ul>
                 <li>CFP Open: July 5, 2015
-                <li>CFP Close: October 15, 2015
-                <li>Announcement of selected proposals: November 15, 2015
+                <li>CFP Close: November 24, 2015
+                <li>Announcement of selected proposals: December 1, 2015
             </ul>
             <hr>
             {% if user and not user.is_anonymous %}
                 <a href="{% url 'website:submitcfp' %}" class="btn btn btn-primary">Submit a Talk</a>
                 <br><br>
                 <p align="justify">
-                If you are interested in taking an hands on tutorial/workshop session kindly write to us at <b>scipy[at]fossee[dot]in</b> with the topic you are interested to take along with a brief bio about yourself. Kindly note that the topic should be related to scientific computing.</p>
+                If you are interested in taking a hands on tutorial/workshop session, kindly write to us at <b>scipy[at]fossee[dot]in</b> with the topic you are interested to take along with a brief bio about yourself. Kindly note that the topic should be related to scientific computing.</p>
             {% else %}
-                <p>Login/Register to submit a talk
+                <p><h4>Login/Register to Submit a Proposal</h4>
                 {% if invalid %}
                   <center>
                     <div class="alert" style="width:300px;height:45px;">
diff --git a/website/templates/submit-cfp.html b/website/templates/submit-cfp.html
old mode 100644
new mode 100755
index f75a373..fc76c58
--- a/website/templates/submit-cfp.html
+++ b/website/templates/submit-cfp.html
@@ -39,7 +39,6 @@
         <form id="contact" action="" method=POST enctype="multipart/form-data">
           <div class="row1">
             {{ proposal_form.as_p }}
-            {{ proposal_form.erros }}
           </div>
           {% csrf_token %}
         <center><button class="btn btn btn-lg" type="submit">Submit</button></center>
-- 
cgit