From 09725bede047eaa79a40ac655962743e83530aa1 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <_@chrisjrn.com>
Date: Mon, 15 Aug 2016 14:04:55 +1000
Subject: [PATCH] Modifications to review_admin.html (#62)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Modifications to review_admin.html

* Adds “submit & jump to random proposal” button

* If user has a speaker profile, display their speaker profile name alongside their comments instead of their user name.
---
 .../symposion/reviews/review_admin.html        | 18 ++++++++++++++++--
 .../symposion/reviews/review_detail.html       | 12 ++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pinaxcon/templates/symposion/reviews/review_admin.html b/pinaxcon/templates/symposion/reviews/review_admin.html
index 00edf5b8..5a07a91d 100644
--- a/pinaxcon/templates/symposion/reviews/review_admin.html
+++ b/pinaxcon/templates/symposion/reviews/review_admin.html
@@ -1,7 +1,7 @@
 {% extends "symposion/reviews/base.html" %}
 
 {% block body %}
-    <h1>Reviewers</h1>
+    <h1>Reviewers – {{ section_slug }}</h1>
 
     <table class="table table-striped">
         <tr>
@@ -14,6 +14,9 @@
             <th>
                 Comments
             </th>
+            <th>
+                Avg
+            </th>
             <th>
                 +2
             </th>
@@ -26,11 +29,16 @@
             <th>
                 &minus;2
             </th>
+            <th>
+                Abstain
+            </th>
         </tr>
         {% for reviewer in reviewers %}
         <tr>
             <td>
-                <a href="{% url "review_list_user" section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a>
+                <a href="{% url "review_list_user" section_slug reviewer.pk %}">
+                    {{ reviewer.get_full_name }} &lt;{{ reviewer.email }}&gt;
+                </a>
             </td>
             <td>
                 {{ reviewer.total_votes }}
@@ -38,6 +46,9 @@
             <td>
                 {{ reviewer.comment_count }}
             </td>
+            <td>
+                {{ reviewer.average }}
+            </td>
             <td>
                 {{ reviewer.plus_two }}
             </td>
@@ -50,6 +61,9 @@
             <td>
                 {{ reviewer.minus_two }}
             </td>
+            <td>
+                {{ reviewer.abstain }}
+            </td>
         </tr>
         {% endfor %}
     </table>
diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html
index 7e15a3f3..ced77872 100644
--- a/pinaxcon/templates/symposion/reviews/review_detail.html
+++ b/pinaxcon/templates/symposion/reviews/review_detail.html
@@ -107,7 +107,8 @@
                         {% csrf_token %}
                             {{ review_form|bootstrap }}
                             <div class="form-action">
-                                <input type="submit" class="btn btn-primary" name="vote_submit" value="Submit Review" />
+                              <input type="submit" class="btn btn-primary" name="vote_submit" value="Submit Review" />
+                              <input type="submit" class="btn btn-primary" name="vote_submit_and_random" value="Submit Review and jump to random proposal" />
                             </div>
                     </form>
                 {% else %}
@@ -130,7 +131,14 @@
                                 </div>
                             {% endif %}
                             <div class="review-content">
-                                &nbsp; <b>{% user_display review.user %}</b>
+                                &nbsp;
+                                <b>
+                                  {% if review.user.speaker_profile %}
+                                    {{ review.user.speaker_profile.name }}
+                                  {% else %}
+                                    {% user_display review.user %}
+                                  {% endif %}
+                                </b>
                                 {{ review.submitted_at|timesince }} ago <br />
                                 {{ review.comment_html|safe }}
                             </div>