#962 reconciling files with develop

opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html

@@ -22,7 +22,7 @@
     <div class="sidebar__inner">
         <h5>Reviews &amp; assignees</h5>
 
-        {% include 'funds/includes/review_table.html' %}
+        {% include 'funds/includes/review_sidebar.html' %}
 
         <div class="wrapper wrapper--sidebar-buttons">
             {% include 'review/includes/review_button.html' with submission=object class="button--half-width" %}

opentech/apply/funds/templates/funds/includes/review_table.html → opentech/apply/funds/templates/funds/includes/review_sidebar.html

 {% load review_tags %}
-<table class="reviews-sidebar js-reviews-sidebar">
+<ul class="reviews-sidebar js-reviews-sidebar">
     {% if reviews_exist %}
-        <tr class="tr tr--subchild light-grey-bg">
-            <th colspan="2"></th>
-            <th>{{ recommendation|traffic_light }}</th>
-            <th></th>
-        </tr>
+        <li class="reviews-sidebar__item reviews-sidebar__item--header">
+            <div></div>
+            <div>{{ recommendation|traffic_light }}</div>
+            <div></div>
+        </li>
     {% endif %}
 
     {% if not assigned_staff %}
-        <tr><td colspan="4" class="reviews-sidebar__no-reviews">No reviews yet</td></tr>
+        <li class="reviews-sidebar__no-reviews">No reviews yet</li>
     {% endif %}
 
     {% for review_data in reviews_block.role_reviewed %}
-        {% include 'funds/includes/review_table_row.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 %}
     {% endfor %}
 
     {% for review_data in reviews_block.staff_reviewed %}
-        {% include 'funds/includes/review_table_row.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 %}
     {% endfor %}
 
     {% for review_data in reviews_block.role_not_reviewed %}
-        {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer role=review_data.role missing=True %}
+        {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer role=review_data.role missing=True %}
     {% endfor %}
 
     {% for review_data in reviews_block.staff_not_reviewed %}
-        {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer missing=True %}
+        {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True %}
     {% endfor %}
 
     {% if object.stage.has_external_review %}
-        <tr class="tr tr--subchild"><td colspan="4"><hr></td></tr>
         {% 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_table_row.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 %}
             {% endfor %}
 
             {% for review_data in reviews_block.external_not_reviewed %}
-                {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer missing=True class="hidden"  %}
+                {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True class="is-hidden" %}
             {% endfor %}
 
-            <tr><td colspan="4"><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></td></tr>
+            <li><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></li>
         {% endif %}
     {% endif %}
-
-</table>
+</ul>
\ No newline at end of file

opentech/apply/funds/templates/funds/includes/review_table_row.html → opentech/apply/funds/templates/funds/includes/review_sidebar_item.html

 {% load wagtailimages_tags %}
 
-<tr class="tr--subchild {{ class }} {% if missing %}no-response{% endif %}">
+<li class="reviews-sidebar__item {{ class }} {% if missing %}no-response{% endif %}">
     {% if missing %}
-        <td class="reviews-sidebar__author" colspan="2">
-            <span>
-                {{ reviewer }}
-                {% if role %}{% image role.icon max-12x12 %}{% endif %}
-            </span>
-        </td>
-        <td>-</td>
-        <td>-</td>
+        <div class="reviews-sidebar__name">
+            <span>{{ reviewer }}</span>
+            {% if role %}{% image role.icon max-12x12 %}{% endif %}
+        </div>
+        <div>-</div>
+        <div>-</div>
     {% else %}
-        <td class="reviews-sidebar__author" colspan="2">
-            {% if request.user.is_apply_staff or request.user == reviewer %}
+        {% if request.user.is_apply_staff or request.user == reviewer %}
+            <div>
                 <a href="{% url 'apply:submissions:reviews:review' submission_pk=review.submission.id pk=review.id %}">
-                    <span>
-                        {{ reviewer }}
+                    <div class="reviews-sidebar__name">
+                        <span>{{ reviewer }}</span>
                         {% if role %}{% image role.icon max-12x12 %}{% endif %}
-                    </span>
+                    </div>
                 </a>
                 <div class="reviews-sidebar__date">{{ review.updated_at|date:"Y-m-d" }}</div>
-            {% else %}
-                <span>
-                    {{ reviewer }}
-                    {% if role %}{% image role.icon max-12x12 %}{% endif %}
-                </span>
-            {% endif %}
-        </td>
-        <td>{{ review.get_recommendation_display }}</td>
-        <td>{{ review.get_score_display }}</td>
+            </div>
+        {% else %}
+            <div class="reviews-sidebar__name">
+                <span>{{ reviewer }}</span>
+                {% if role %}{% image role.icon max-12x12 %}{% endif %}
+            </div>
+        {% endif %}
+        <div>{{ review.get_recommendation_display }}</div>
+        <div>{{ review.get_score_display }}</div>
     {% endif %}
-</tr>
+</li>
 
 {% for opinion in review.opinions.all %}
-<tr class="tr--subchild">
-    <td class="reviews-sidebar__author" colspan="2">
-        <span>
-            {{ opinion.author }}
-            {% if opinion.get_author_assignment %}{% image opinion.get_author_assignment.icon max-12x12 %}{% endif %}
-        </span>
-    </td>
-    <td></td>
-    <td>{{ opinion.get_opinion_display }}</td>
-</tr>
+<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