From d1312be1555c8cb0d372acd7bac28cb6ad051a3d Mon Sep 17 00:00:00 2001
From: komalsheth286
Date: Wed, 5 Oct 2016 14:16:42 +0530
Subject: resubmission of proposal is added

---
 scipy2016/settings.py                 |  2 +-
 website/templates/base.html           |  4 ++--
 website/templates/cfp.html            |  4 ++--
 website/templates/view-abstracts.html | 14 +++++++++-----
 website/views.py                      | 12 +++++++++---
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/scipy2016/settings.py b/scipy2016/settings.py
index 9f24b41..1c0ef19 100755
--- a/scipy2016/settings.py
+++ b/scipy2016/settings.py
@@ -148,7 +148,7 @@ USE_TZ = True
 STATIC_URL = '/static/'
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
-MEDIA_URL = "/downloads/"
+MEDIA_URL = "/2016/downloads/"
 
 LOGIN_REDIRECT_URL = '/cfp'
 
diff --git a/website/templates/base.html b/website/templates/base.html
index fb3d745..a9ac680 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -89,10 +89,10 @@
         <col width="40%" />
     </colgroup>
 <tr>
-<td> <img class="img-responsive" src="{% static 'img/ajith.jpg' %}" height=90% width=60% alt="">
+<td> <img class="img-responsive" src="{% static 'img/ajith.jpg' %}" height=90% width=80% alt="">
 					</td>
 <td></td>
-<td> <img class="img-responsive" src="{% static 'img/anand1.png' %}" height=90% width=60% alt="">
+<td> <img class="img-responsive" src="{% static 'img/anand1.png' %}" height=90% width=80% alt="">
 					</td>
 
 </tr>
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index e0eb537..9c8f3dc 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -64,7 +64,7 @@
           </center>
           {% endif %}
  {% if user and not user.is_anonymous and not login_required %}
-  <p>We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 (max) hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
+  <p>We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
 </p>
                   <span><h2><u>Important Dates</u></h2></span>
              <ul>
@@ -85,7 +85,7 @@
         {% endif %}
                
       {% else %}
-      <p align = "justify">We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 (max) hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
+      <p align = "justify">We invite you to submit proposals for talks/ workshops to be presented at SciPy 2016. The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 hours. The workshops are to be conducted in two parallel tracks for basic and advanced users.
 </p><hr>
       <ul class="features">
 <li>
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html
index 8979363..6a9a72b 100755
--- a/website/templates/view-abstracts.html
+++ b/website/templates/view-abstracts.html
@@ -71,7 +71,6 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
         <col width="70%" />
         <col width="10%" />
         <col width="10%" />
-        <col width="10%" />
         <col width="20%" />
 
         {% endif %}
@@ -88,6 +87,8 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
       {% endif %}
       {% if user.is_superuser %}
     <th> Ratings
+      {% else %}
+    <th> Comments
       {% endif %}
     <th> Status
     {% for proposal in proposals %}
@@ -107,12 +108,15 @@ You have not submitted any proposal. To submit proposal click <a href="{% url 'w
        <td  style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"> {{proposal.title}}</td>
          <td ><a href="{% url 'website:abstract_details' proposal.id %}">View</a> </td>
       {% endif %}
-{% if user.is_superuser %}
-      <td> {% for rating in proposal.ratings_set.all %}
-        {{ rating.rating}} by {{rating.user}}<br>
+      <td>{% if user.is_superuser %}
+         {% for rating in proposal.ratings_set.all %}
+        {{ rating.rating}} - {{rating.user}}<br>
         {% endfor %}
+        {% else %}
+          {{proposal.comments_set.count}}
+        {% endif %}
+
         </td>
-{% endif %}
       <td>
          {% if proposal.status = 'Accepted' %}
          <h5 style="color:green;">{{proposal.status}}</h5>
diff --git a/website/views.py b/website/views.py
index b516fad..96fa6bb 100755
--- a/website/views.py
+++ b/website/views.py
@@ -266,10 +266,14 @@ def edit_proposal(request, proposal_id = None):
     if user.is_authenticated():
         proposal = Proposal.objects.get(id=proposal_id)
         if proposal.proposal_type == 'ABSTRACT':
-            form = ProposalForm(request.POST, request.FILES, instance=proposal)
+            form = ProposalForm( instance=proposal)
         else:
-            form = WorkshopForm(request.POST, request.FILES, instance=proposal)
+            form = WorkshopForm( instance=proposal)
         if request.method == 'POST':
+            if proposal.proposal_type == 'ABSTRACT':
+                form = ProposalForm( request.POST, request.FILES, instance=proposal)
+            else:
+                form = WorkshopForm( request.POST, request.FILES, instance=proposal)
             if form.is_valid():
                 data = form.save(commit = False)
                 data.user = user
@@ -279,7 +283,9 @@ def edit_proposal(request, proposal_id = None):
                 return render(request, 'cfp.html')
             else:
                 context['user'] = user
-                return render(request, 'cfp.html', context)
+                context['form'] = form
+                context['proposal'] = proposal
+                return render(request, 'edit-proposal.html', context)
         context['user'] = user
         context['form'] = form
         context['proposal'] = proposal
-- 
cgit