Changed rank list.html to be consistent with review list. default tip
authorMadhusudan.C.S <madhusudancs@gmail.com>
Fri, 14 Aug 2009 11:07:24 +0530
changeset 49 33c54f815fd5
parent 48 9bdb5a00689a
Changed rank list.html to be consistent with review list.
app/projrev/models.py
app/templates/projrev/proposal/list.html
app/templates/projrev/proposal/review_list.html
--- a/app/projrev/models.py	Thu Aug 13 04:27:08 2009 +0530
+++ b/app/projrev/models.py	Fri Aug 14 11:07:24 2009 +0530
@@ -706,7 +706,7 @@
 
   # Field containing the pin code
   pin_code = models.IntegerField()
-  pin_code.help_text = "Enter your address's pin code."
+  pin_code.help_text = "Enter your address's pin code without any spaces."
 
   # Field containing the state to which the institution belongs to.
   state = models.CharField(
--- a/app/templates/projrev/proposal/list.html	Thu Aug 13 04:27:08 2009 +0530
+++ b/app/templates/projrev/proposal/list.html	Fri Aug 14 11:07:24 2009 +0530
@@ -1,23 +1,30 @@
 {% extends "projrev/base.html" %}
+{% load review_helpers %}
+
 {% block content %}
 <div class="post">
   <div class="list">
   <table>
     <tr>
-      <th class="first">MICR Code</th>
+      <th class="first">Serial No.</th>
+      <th>Title</th>
+      <th>MICR Code</th>
       <th>Line Item</th>
       <th>Institution</th>
       <th>State</th>
       <th>District</th>
+      <th>Old Serial No.</th>
     </tr>
     {% for project in projects %}
-      <tr class="row-a"><td><a href='{{ row_url }}{{ project.micr_code }}'>
-        {{ project.micr_code }}</td>
+      <tr class="row-a"><td>{{ project|serial_no:"new" }}</td>
+      <td><a href='{{ row_url }}{{ project.micr_code }}'>{{ project.title }}</a></td>
+        <td>{{ project.micr_code }}</td>
         <td>{{ project.line_item }}</td>
         <td>{{ project.institution }}</td>
         <td>{{ project.state }}</td>
         <td>{{ project.district }}</td>
-      </a></tr>
+        <td>{{ project|serial_no:"old" }}</td>
+      </tr>
     {% endfor %}
   </table>
   </div>
--- a/app/templates/projrev/proposal/review_list.html	Thu Aug 13 04:27:08 2009 +0530
+++ b/app/templates/projrev/proposal/review_list.html	Fri Aug 14 11:07:24 2009 +0530
@@ -8,8 +8,8 @@
   <table>
     <tr>
       <th class="first">Serial No.</th>
+      <th>Title</th>
       <th>MICR Code</th>
-      <th>Title</th>
       <th>Line Item</th>
       <th>Institution</th>
       <th>State</th>
@@ -17,22 +17,21 @@
       <th>Old Serial No.</th>
     </tr>
     {% for project in projects %}
-      <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 }}'>
-      {% else %}
-      <a id='getredirect_{{ project.project|serial_no:"new" }}' href='{{ row_url }}{{ project.project.micr_code }}'>
-      {% endif %}
-        {{ project.project|serial_no:"new" }}
-        </td>
+      <tr class="row-a">
+        <td>{{ project.project|serial_no:"new" }}</td>
+        <td>
+        {% if project.user_review %}
+        <a id='getredirect_{{ project.project|serial_no:"new" }}' href='{{ row_url }}{{ project.project.micr_code }}/{{ project.user_review.id }}'>
+        {% else %}
+        <a id='getredirect_{{ project.project|serial_no:"new" }}' href='{{ row_url }}{{ project.project.micr_code }}'>
+        {% endif %}{{ project.project.title }}</a></td>
         <td>{{ project.project.micr_code }}</td>
-        <td>{{ project.project.title }}</td>
         <td>{{ project.project.line_item }}</td>
         <td>{{ project.project.institution }}</td>
         <td>{{ project.project.state }}</td>
         <td>{{ project.project.district }}</td>
         <td>{{ project.project|serial_no:"old" }}</td>
-      </a></tr>
+      </tr>
     {% endfor %}
   </table>
   </div>
@@ -43,8 +42,8 @@
 <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 />
+  <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" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <input class="colorbox-button" type="submit" onclick="location.href='{{ row_url }}{{ project.project.micr_code }}'" value="Start a fresh review" /><br /><br />
   <strong>Your previous review:</strong><br />
  <div style='text-align: left;'>
  <table>