Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8 from lca2017/chrisjrn/006-display-scores

Browse source 
Adds score display to the review list
This commit is contained in:
Christopher Neugebauer 2016-06-18 00:09:18 -07:00 committed by GitHub
commit d7d36e2c05
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pinaxcon/templates/site_base.html
View file

@ -47,8 +47,10 @@
{% block scripts %} {% block scripts %}
{% include "_scripts.html" %} {% include "_scripts.html" %}
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
{% block extra_script %}{% endblock %}
{% endblock %} {% endblock %}
{% block extra_body_base %} {% block extra_body_base %}
{% analytics %} {% analytics %}
{% block extra_body %}{% endblock %} {% block extra_body %}{% endblock %}

2
pinaxcon/templates/symposion/reviews/_review_table.html
View file

@ -6,6 +6,7 @@
<th>{% trans "Speaker / Title" %}</th> <th>{% trans "Speaker / Title" %}</th>
<th>{% trans "Category" %}</th> <th>{% trans "Category" %}</th>
<th><i class="fa fa-comment-alt"></i></th> <th><i class="fa fa-comment-alt"></i></th>
<th>{% trans "Score" %}</th>
<th>{% trans "+2" %}</th> <th>{% trans "+2" %}</th>
<th>{% trans "+1" %}</th> <th>{% trans "+1" %}</th>
<th>{% trans "-1" %}</th> <th>{% trans "-1" %}</th>
@ -26,6 +27,7 @@
</td> </td>
<td>{{ proposal.track }}</td> <td>{{ proposal.track }}</td>
<td>{{ proposal.comment_count }}</td> <td>{{ proposal.comment_count }}</td>
<td>{{ proposal.score }}</td>
<td>{{ proposal.plus_two }}</td> <td>{{ proposal.plus_two }}</td>
<td>{{ proposal.plus_one }}</td> <td>{{ proposal.plus_one }}</td>
<td>{{ proposal.minus_one }}</td> <td>{{ proposal.minus_one }}</td>

8
pinaxcon/templates/symposion/reviews/review_detail.html
View file

@ -94,7 +94,7 @@
<hr /> <hr />
{% if review_form %} {% if review_form %}
<form method="POST" action="" class="review-form"> <form method="POST" action="#proposal-reviews" class="review-form">
<legend>{% trans "Submit Review" %}</legend> <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> <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 %} {% csrf_token %}
@ -177,11 +177,15 @@
$(".nav-tabs a[href='" + location.hash + "']").click(); $(".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) { if (History.enabled) {
History.pushState(null, null, $(e.target).attr("href")); History.pushState(null, null, $(e.target).attr("href"));
} }
}); });
if (window.location.hash !== '') {
$('.nav-tabs a[href="' + window.location.hash + '"]').tab('show')
}
}); });
</script> </script>