From 7137c7e70624ea37656f905032cfb02726306af8 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Mon, 18 Aug 2014 12:47:27 +0530
Subject: Modification to proposal and sample notebook flow

After the proposal is rejected, user will again submit the proposal.
So the proposal form is filled with the initial values of the rejected
proposal.

Sample notebook can be submitted only if the proposal is approved else
will display a message saying 'not permitted'

User after sample notebook submission can anytime edit it.

Modified the template for the reviewer to see the new and old proposal.
Since the ids where same for the collapse element in the loop so there
was problem in javascript.

Profile view modified.
First checks for the user profile. If exists then updates or else
creates a new profile for the user. This will prevent multiple profile
for a single user.[Alternatively, we can give one-to-one relation between
user and profile in models]
---
 tbc/templates/base.html | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tbc/templates/base.html')

diff --git a/tbc/templates/base.html b/tbc/templates/base.html
index 9708a53..ab79738 100755
--- a/tbc/templates/base.html
+++ b/tbc/templates/base.html
@@ -206,6 +206,15 @@
         </center>
         <div class="clearfix"></div>
     {% endif %}
+    {% if cannot_submit_sample %}
+        <center>
+            <div class="alert" style="width:400px;height:25px;">
+                <a class="close" data-dismiss="alert" href="#">&times;</a>
+                <p>You have not been permitted to send sample notebook.</p>
+            </div>
+        </center>
+        <div class="clearfix"></div>
+    {% endif %}
     <div class="row-fluid">
         <center><h3>Recent Submissions</h3></center>
         {% for item in items %}
-- 
cgit