Attempt to rework the review screen to be more useful
Fix indenting and whitespace because it was the only way to track down the errors..
This commit is contained in:
James Polley
James Polley
parent
ec665d7bd6
commit
b7aa0a4687
1 changed files with 169 additions and 162 deletions
|
|
@ -55,17 +55,55 @@
|
|||
<div class="tabbable">
|
||||
<ul class="nav nav-pills">
|
||||
<li class="nav-item"><a class="nav-link active" href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="#proposal-reviews" data-toggle="tab">{% trans "Reviews" %} <span class="badge">{{ reviews|length }}</span></a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="#proposal-feedback" data-toggle="tab">{% trans "Speaker Feedback" %} <span class="badge">{{ proposal.messages.all|length }}</span></a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="proposal-detail">
|
||||
{% include "symposion/proposals/_proposal_fields.html" %}
|
||||
</div>
|
||||
<div class="tab-pane" id="proposal-reviews">
|
||||
<div class="tab-pane" id="proposal-feedback">
|
||||
<div class="row my-4">
|
||||
<div class="col-12">
|
||||
<h2>{% trans "Current Results" %}</h2>
|
||||
{% if review_messages %}
|
||||
<h2>{% trans "Conversation with the submitter" %}</h2>
|
||||
{% for message in review_messages %}
|
||||
<div class="comment-box">
|
||||
<div class="commment-content">
|
||||
<b>{{ message.user.username }}</b>
|
||||
{{ message.submitted_at|timesince }} ago <br />
|
||||
{{ message.message|safe }}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<hr />
|
||||
{% endif %}
|
||||
|
||||
<form class="form-horizontal" action="" method="POST"accept-charset="utf-8">
|
||||
<h3>{% trans "Send a message" %}</h3>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you'd like to communicate with the submitter, use the following form and they will be
|
||||
notified and given the opportunity to respond.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
{% csrf_token %}
|
||||
{{ message_form|bootstrap }}
|
||||
<div class="form-actions">
|
||||
<input type="submit" class="btn btn-primary" name="message_submit" value="Send Message" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card" id="proposal-reviews">
|
||||
<div class="row my-4">
|
||||
<div class="col-12">
|
||||
<button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#currentResults" aria-expanded="false" aria-controls="currentResults">
|
||||
{% trans "Current Results" %}
|
||||
</button>
|
||||
<div class="collapse" id="currentResults">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<th>+2 votes</th>
|
||||
|
|
@ -84,6 +122,7 @@
|
|||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
|
|
@ -101,9 +140,16 @@
|
|||
{% else %}
|
||||
<p>You do not have permission to vote on this proposal.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row my-4">
|
||||
<div class="col-12">
|
||||
|
||||
{% if reviews %}
|
||||
<h5>Review Comments</h5>
|
||||
<button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#reviewDetails" aria-expanded="false" aria-controls="reviewDetails">
|
||||
Review Comments
|
||||
</button>
|
||||
<div class="collapse" id="reviewDetails">
|
||||
{% for review in reviews %}
|
||||
<div class="review-box">
|
||||
<div class="vote pull-left">
|
||||
|
|
@ -131,55 +177,16 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="proposal-feedback">
|
||||
<div class="row my-4">
|
||||
<div class="col-12">
|
||||
{% if review_messages %}
|
||||
<h2>{% trans "Conversation with the submitter" %}</h2>
|
||||
{% for message in review_messages %}
|
||||
<div class="comment-box">
|
||||
<div class="commment-content">
|
||||
<b>{{ message.user.username }}</b>
|
||||
{{ message.submitted_at|timesince }} ago <br />
|
||||
{{ message.message|safe }}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<hr />
|
||||
{% endif %}
|
||||
|
||||
<form class="form-horizontal" action="" method="POST"accept-charset="utf-8">
|
||||
<h3>{% trans "Send a message" %}</h3>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you'd like to communicate with the submitter, use the following form and he or she will be
|
||||
notified and given the opportunity to respond.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
{% csrf_token %}
|
||||
{{ message_form|bootstrap }}
|
||||
<div class="form-actions">
|
||||
<input type="submit" class="btn btn-primary" name="message_submit" value="Send Message" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<a href="{% url "user_random" proposal.section.slug %}">
|
||||
{% trans "Jump to a random unreviewed proposal" %}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue