From 577868d443b8f7d6a095e48414b1a67eee5d141e Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Thu, 21 Feb 2019 11:34:06 +0000
Subject: [PATCH] GH-979: update review sidebar filenames to reflect it not
being a table
---
.../funds/includes/review_sidebar.html | 12 +++++-----
.../funds/includes/review_sidebar_item.html | 24 ++++++++++++-------
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar.html b/opentech/apply/funds/templates/funds/includes/review_sidebar.html
index 210777f13..9120a46e2 100644
--- a/opentech/apply/funds/templates/funds/includes/review_sidebar.html
+++ b/opentech/apply/funds/templates/funds/includes/review_sidebar.html
@@ -13,11 +13,11 @@
{% endif %}
{% for review_data in reviews_block.role_reviewed %}
- {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer role=review_data.role %}
+ {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer role=review_data.role opinions=review_data.opinions %}
{% endfor %}
{% for review_data in reviews_block.staff_reviewed %}
- {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer %}
+ {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer opinions=review_data.opinions %}
{% endfor %}
{% for review_data in reviews_block.role_not_reviewed %}
@@ -29,11 +29,11 @@
{% endfor %}
{% if object.stage.has_external_review %}
- {% if reviews_block.external_reviewed or reviews_block.external_not_reviewed %}
- <hr class="reviews-sidebar__split">
+ {% if reviews_block.external_reviewed or reviews_block.external_not_reviewed %}
+ <hr class="reviews-sidebar__split">
{% for review_data in reviews_block.external_reviewed %}
- {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer %}
+ {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer opinions=review_data.opinions %}
{% endfor %}
{% for review_data in reviews_block.external_not_reviewed %}
@@ -43,4 +43,4 @@
<li><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></li>
{% endif %}
{% endif %}
-</ul>
\ No newline at end of file
+</ul>
diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
index 6a11896af..87dce8719 100644
--- a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
+++ b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
@@ -31,12 +31,18 @@
</li>
{% for opinion in review.opinions.all %}
-<li class="reviews-sidebar__item {{ class }}">
- <div class="reviews-sidebar__name">
- <span>{{ opinion.author }}</span>
- {% if opinion.get_author_assignment %}{% image opinion.get_author_assignment.icon max-12x12 %}{% endif %}
- </div>
- <div></div>
- <div>{{ opinion.get_opinion_display }}</div>
-</li>
-{% endfor %}
\ No newline at end of file
+ {% if forloop.first %}
+ <ul class="reviews-sidebar__decision">
+ {% endif %}
+ <li class="reviews-sidebar__item reviews-sidebar__item--decision">
+ <div class="reviews-sidebar__name">
+ <span>{{ opinion.author }}</span>
+ {% if opinion.role %}{% image opinion.role.icon max-12x12 %}{% endif %}
+ </div>
+ <div></div>
+ <div class="reviews-sidebar__outcome {{ opinion.get_opinion_display|lower }}">{{ opinion.get_opinion_display}}</div>
+ </li>
+ {% if forloop.last %}
+ </ul>
+ {% endif %}
+{% endfor %}
--
GitLab