From b7aa0a46874d635388dabf3560ab11320181a99f Mon Sep 17 00:00:00 2001 From: James Polley Date: Thu, 2 Aug 2018 12:28:27 +0000 Subject: [PATCH] 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.. --- .../symposion/reviews/review_detail.html | 331 +++++++++--------- 1 file changed, 169 insertions(+), 162 deletions(-) diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html index 58922920..648abdab 100644 --- a/pinaxcon/templates/symposion/reviews/review_detail.html +++ b/pinaxcon/templates/symposion/reviews/review_detail.html @@ -8,178 +8,185 @@ {% if is_manager %}
-
- {% csrf_token %} -
- {% if proposal.result.status == "accepted" %} - Accepted -
- - - -
- - {% else %} - {% if proposal.result.status == "rejected" %} - Rejected -
- - - -
- {% else %} - {% if proposal.result.status == "standby" %} - Standby -
- - - -
- {% else %} - Undecided -
- - - -
- {% endif %} - {% endif %} - {% endif %} -
-
+
+ {% csrf_token %} +
+ {% if proposal.result.status == "accepted" %} + Accepted +
+ + + +
+ + {% else %} + {% if proposal.result.status == "rejected" %} + Rejected +
+ + + +
+ {% else %} + {% if proposal.result.status == "standby" %} + Standby +
+ + + +
+ {% else %} + Undecided +
+ + + +
+ {% endif %} + {% endif %} + {% endif %} +
+
{% endif %}

#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})

- -
-
- {% include "symposion/proposals/_proposal_fields.html" %} -
-
-
-
-

{% trans "Current Results" %}

- - - - - - - - - - - - - - - - - -
+2 votes+1 votes-1 votes-2 votes{% trans "Total Responses" %}
{{ proposal.plus_two }}{{ proposal.plus_one }}{{ proposal.minus_one }}{{ proposal.minus_two }}{{ proposal.total_votes }}
- -
- - {% if review_form %} -
- {% trans "Submit Review" %} -

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). Your vote and comments are not public and will only be viewable by other reviewers.

- {% csrf_token %} - {{ review_form|bootstrap }} -
- - -
-
- {% else %} -

You do not have permission to vote on this proposal.

- {% endif %} - - {% if reviews %} -
Review Comments
- {% for review in reviews %} -
-
- {{ review.vote }} -
- {% if is_manager %} -
-
- {% csrf_token %} - -
-
- {% endif %} -
-   - - {% if review.user.speaker_profile %} - {{ review.user.speaker_profile.name }} - {% else %} - {{ review.user.username }} - {% endif %} - - {{ review.submitted_at|timesince }} ago
- {{ review.comment_html|safe }} -
-
- {% endfor %} - {% endif %} -
-
-
-
-
-
- {% if review_messages %} -

{% trans "Conversation with the submitter" %}

- {% for message in review_messages %} -
-
- {{ message.user.username }} - {{ message.submitted_at|timesince }} ago
- {{ message.message|safe }} -
-
- {% endfor %} -
- {% endif %} - -
-

{% trans "Send a message" %}

-

- {% 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 %} -

- {% csrf_token %} - {{ message_form|bootstrap }} -
- -
-
-
-
-
+ +
+
+ {% include "symposion/proposals/_proposal_fields.html" %}
+
+
+
+ {% if review_messages %} +

{% trans "Conversation with the submitter" %}

+ {% for message in review_messages %} +
+
+ {{ message.user.username }} + {{ message.submitted_at|timesince }} ago
+ {{ message.message|safe }} +
+
+ {% endfor %} +
+ {% endif %} + +
+

{% trans "Send a message" %}

+

+ {% 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 %} +

+ {% csrf_token %} + {{ message_form|bootstrap }} +
+ +
+
+
+
+
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + +
+2 votes+1 votes-1 votes-2 votes{% trans "Total Responses" %}
{{ proposal.plus_two }}{{ proposal.plus_one }}{{ proposal.minus_one }}{{ proposal.minus_two }}{{ proposal.total_votes }}
+
+ +
+ + {% if review_form %} +
+ {% trans "Submit Review" %} +

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). Your vote and comments are not public and will only be viewable by other reviewers.

+ {% csrf_token %} + {{ review_form|bootstrap }} +
+ + +
+
+ {% else %} +

You do not have permission to vote on this proposal.

+ {% endif %} +
+
+
+
+ + {% if reviews %} + +
+ {% for review in reviews %} +
+
+ {{ review.vote }} +
+ {% if is_manager %} +
+
+ {% csrf_token %} + +
+
+ {% endif %} +
+   + + {% if review.user.speaker_profile %} + {{ review.user.speaker_profile.name }} + {% else %} + {{ review.user.username }} + {% endif %} + + {{ review.submitted_at|timesince }} ago
+ {{ review.comment_html|safe }} +
+
+ {% endfor %} +
+ {% endif %} +
+
- - {% trans "Jump to a random unreviewed proposal" %} - -
-
- - + + {% trans "Jump to a random unreviewed proposal" %} + {% endblock %}