--- a/app/templates/projrev/proposal/review_list.html	Thu Aug 13 04:01:15 2009 +0530
+++ b/app/templates/projrev/proposal/review_list.html	Thu Aug 13 04:27:08 2009 +0530
@@ -17,20 +17,6 @@
       <th>Old Serial No.</th>
     </tr>
     {% for project in projects %}
-      {% if project.not_this_proposal %}
-      <div class='hidden' style="display: none;">
-        <div id='message_{{ project.project|serial_no:"new" }}' style='padding:10px; background:#fff;'>
-          This proposal is revised after you submitted a review. You will have to submit a new review to the revised proposal. Press the relevant button.<br />
-          <a href='{{ row_url }}{{ project.project.micr_code }}/{{ project.user_review.id }}?new=0'>Start with my previous review</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <a href='{{ row_url }}{{ project.project.micr_code }}'>Start a fresh review</a>
-        </div>
-      </div>
-      <script type="text/javascript">
-        $(document).ready(function () {
-          $('#getredirect_{{ project.project|serial_no:"new" }}').colorbox({width:"50%", inline:true, href:"#message_{{ project.project|serial_no:"new" }}", title:"What do you want to do?"});
-        });
-      </script>
-      {% endif %}
       <tr class="row-a"><td>
       {% if project.user_review %}
       <a id='getredirect_{{ project.project|serial_no:"new" }}' href='{{ row_url }}{{ project.project.micr_code }}/{{ project.user_review.id }}'>
@@ -51,4 +37,92 @@
   </table>
   </div>
 </div>
+
+{% for project in projects %}
+{% if project.not_this_proposal %}
+<div class='hidden' style="display: none;">
+ <div id='message_{{ project.project|serial_no:"new" }}' style='padding:10px; background:#fff;'>
+  This proposal is revised after you submitted a review. You will have to submit a new review to the revised proposal. Select the relevant button below.<br /><br />
+  <input class="colorbox-button" type="submit" onclick="location.href='{{ row_url }}{{ project.project.micr_code }}'" value="Start a fresh review" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <input class="colorbox-button" type="submit" onclick="location.href='{{ row_url }}{{ project.project.micr_code }}/{{ project.user_review.id }}?new=0'" value="Start with my previous review" /><br /><br />
+  <strong>Your previous review:</strong><br />
+ <div style='text-align: left;'>
+ <table>
+ <tr>
+  <td>
+   <strong>Feasibility of the proposed activity and the appropriateness of the time frame: </strong>
+  </td>
+  <td>{{ project.user_review.attribute1 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a1 }}</td></tr>
+ <tr>
+  <td>
+   <strong>Uniqueness/novelty/innovation of the said proposal:</strong>
+  </td>
+  <td>{{ project.user_review.attribute2 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a2 }}</td></tr>
+ <tr>
+  <td>
+   <strong>Scope for inter-institutional collaboration and development:</strong>
+  </td>
+  <td>{{ project.user_review.attribute3 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a3 }}</td></tr>
+ <tr>
+  <td>
+   <strong>The organisation of the programme to be carried out:</strong>
+  </td>
+  <td>{{ project.user_review.attribute4 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a4 }}</td></tr>
+ <tr>
+  <td>
+   <strong>The details of the work as the outlined by the principal investigator(PI):</strong>
+  </td>
+  <td>{{ project.user_review.attribute5 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a5 }}</td></tr>
+ <tr>
+  <td>
+   <strong>Sufficiency of funds as requested by the PI:</strong>
+  </td>
+  <td>{{ project.user_review.attribute6 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a6 }}</td></tr>
+ <tr>
+  <td>
+   <strong>Social impact/reach/spread of the outcome of the proposal:</strong>
+  </td>
+  <td>{{ project.user_review.attribute7 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a7 }}</td></tr>
+ <tr>
+  <td>
+   <strong>Contribution of the proposal to minimizing the digital divide in our country:</strong>
+  </td>
+  <td>{{ project.user_review.attribute8 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a8 }}</td></tr>
+ <tr>
+  <td>
+   <strong>Any other matter which is likely to affect the execution of the project:</strong>
+  </td>
+  <td>{{ project.user_review.attribute9 }}</td>
+ </tr>
+ <tr><td>Comment: {{ project.user_review.comment_a9 }}</td></tr>
+ </table>
+ <table>
+ <tr><td><strong>Overall comment:</strong></td><td>{{ project.user_review.comment }}</td></tr>
+ </table>
+ </div>
+ </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function () {
+  $('#getredirect_{{ project.project|serial_no:"new" }}').colorbox({width:"50%", inline:true, href:"#message_{{ project.project|serial_no:"new" }}", title:"What do you want to do?"});
+});
+</script>
+{% endif %}
+{% endfor %}
 {% endblock content %}
\ No newline at end of file