From cad0d008178985041c4c63f557d7dd40c5b818b5 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Sat, 18 Jun 2016 13:13:31 +1000
Subject: [PATCH 1/2] Adds score display to the review list
---
pinaxcon/templates/symposion/reviews/_review_table.html | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pinaxcon/templates/symposion/reviews/_review_table.html b/pinaxcon/templates/symposion/reviews/_review_table.html
index ad3378e5..b0df383a 100644
--- a/pinaxcon/templates/symposion/reviews/_review_table.html
+++ b/pinaxcon/templates/symposion/reviews/_review_table.html
@@ -6,6 +6,7 @@
<th>{% trans "Speaker / Title" %}</th>
<th>{% trans "Category" %}</th>
<th><i class="fa fa-comment-alt"></i></th>
+ <th>{% trans "Score" %}</th>
<th>{% trans "+2" %}</th>
<th>{% trans "+1" %}</th>
<th>{% trans "-1" %}</th>
@@ -26,6 +27,7 @@
</td>
<td>{{ proposal.track }}</td>
<td>{{ proposal.comment_count }}</td>
+ <td>{{ proposal.score }}</td>
<td>{{ proposal.plus_two }}</td>
<td>{{ proposal.plus_one }}</td>
<td>{{ proposal.minus_one }}</td>
From 2c9527bfa5320ec92cb0bef15ab62349b03bc072 Mon Sep 17 00:00:00 2001
From: Scott Bragg <jsbragg@scriptforge.org>
Date: Sat, 18 Jun 2016 14:27:47 +1000
Subject: [PATCH 2/2] If there are form errors it will now switch to the
appropriate tab
---
pinaxcon/templates/site_base.html | 2 ++
pinaxcon/templates/symposion/reviews/review_detail.html | 8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index f5511555..cd31b720 100644
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -47,8 +47,10 @@
{% block scripts %}
{% include "_scripts.html" %}
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
+ {% block extra_script %}{% endblock %}
{% endblock %}
+
{% block extra_body_base %}
{% analytics %}
{% block extra_body %}{% endblock %}
diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html
index 2751a27c..5f5e6754 100644
--- a/pinaxcon/templates/symposion/reviews/review_detail.html
+++ b/pinaxcon/templates/symposion/reviews/review_detail.html
@@ -94,7 +94,7 @@
<hr />
{% if review_form %}
- <form method="POST" action="" class="review-form">
+ <form method="POST" action="#proposal-reviews" class="review-form">
<legend>{% trans "Submit Review" %}</legend>
<p>Enter your vote and any comment to go along with it. You can revise your vote or comment multiple times with an existing vote (your previously recorded score will be replaced during calculations). <b>Your vote and comments are not public and will only be viewable by other reviewers.</b></p>
{% csrf_token %}
@@ -177,11 +177,15 @@
$(".nav-tabs a[href='" + location.hash + "']").click();
});
- $('#.nav-tabs a[data-toggle="tab"]').on('shown', function (e) {
+ $('.nav-tabs a[data-toggle="tab"]').on('shown', function (e) {
if (History.enabled) {
History.pushState(null, null, $(e.target).attr("href"));
}
});
+
+ if (window.location.hash !== '') {
+ $('.nav-tabs a[href="' + window.location.hash + '"]').tab('show')
+ }
});
</script>