--- a/app/templates/projrev/proposal/rank.html	Thu Aug 06 18:49:06 2009 +0530
+++ b/app/templates/projrev/proposal/rank.html	Mon Aug 10 16:38:13 2009 +0530
@@ -1,4 +1,6 @@
 {% extends "projrev/base.html" %}
+{% load review_helpers %}
+
 {% block content %}
 <div class="post">
 			
@@ -56,77 +58,114 @@
       Attribute Name
     </div>
     <div class='review-right'>
-      <b>Score</b>
+      <b>Score</b>&nbsp;&nbsp;&nbsp;&nbsp;<b>Average</b>
     </div>
     <br />
     <div class='review-left'>
       Attribute 1:
     </div>
     <div class='review-right'>
-      {{ review_score.0 }}
+      {{ review_score.0 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.0 }}
     </div>
     <br />
     <div class='review-left'>
       Attribute 2:
     </div>
     <div class='review-right'>
-      {{ review_score.1 }}
+      {{ review_score.1 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.1 }}
     </div>
     <br />
     <div class='review-left'>
       Attribute 3:
     </div>
     <div class='review-right'>
-      {{ review_score.2 }}
+      {{ review_score.2 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.2 }}
     </div><br />
     <div class='review-left'>
       Attribute 4:
     </div>
     <div class='review-right'>
-      {{ review_score.3 }}
+      {{ review_score.3 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.3 }}
     </div><br />
     <div class='review-left'>
       Attribute 5:
     </div>
     <div class='review-right'>
-      {{ review_score.4 }}
+      {{ review_score.4 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.4 }}
     </div><br />
     <div class='review-left'>
       Attribute 6:
     </div>
     <div class='review-right'>
-      {{ review_score.5 }}
+      {{ review_score.5 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.5 }}
     </div><br />
     <div class='review-left'>
       Attribute 7:
     </div>
     <div class='review-right'>
-      {{ review_score.6 }}
+      {{ review_score.6 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.6 }}
     </div><br />
     <div class='review-left'>
       Attribute 8:
     </div>
     <div class='review-right'>
-      {{ review_score.7 }}
+      {{ review_score.7 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.7 }}
     </div><br />
     <div class='review-left'>
       Attribute 9:
     </div>
     <div class='review-right'>
-      {{ review_score.8 }}
-    </div><br />
+      {{ review_score.8 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ review_avg.8 }}
+    </div><br /><hr /><br />
     <div class='review-left'>
       Overall Score:
     </div>
     <div class='review-right'>
-      {{ total_score }}
+      {{ total_score }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      {{ total_avg }}
     </div>
-  </p>	
-	<p class="post-footer align-right">					
-		<span class="comments">Reviews (5)</span>
-		<span class="date">Last reviewed: Nov 11, 2006</span>
-		<span class="date">Last submitted: Nov 11, 2006</span>	
-	</p>
-				
+  </p>
+
+  <p class="post-footer align-right">
+    <span class="comments">Reviews:
+    {% if nr_reviews %}
+      {{ nr_reviews }}
+    {% else %}
+      (<i>None</i>)
+    {% endif %}
+    </span>
+    <span class="date">Last reviewed:
+    {% if last_reviewed %}
+      {{ last_reviewed|date:"jS F Y h:iA" }}
+    {% else %}
+      (<i>Not Reviewed</i>)
+    {% endif %}
+    </span>
+    <span class="date">Last submitted:
+    {% if last_submitted %}
+      {{ last_submitted|date:"jS F Y h:iA" }}
+    {% else %}
+      (<i>New Submission</i>)
+    {% endif %} 
+    </span> 
+  </p>
+  {% if reviews %}
+  <br /><br />
+  <p>
+  <h2>Reviews: Comments and Scores:</h2>
+  {% for review in reviews %}
+    {% as_review review %}
+  {% endfor %}
+  </p>
+  {% endif %}
 </div>
 {% endblock content %}
\ No newline at end of file