Skip to content

Commit cb4a288

Browse files
authored
fix: separate tables on team review page. Fixes ietf-tools#3679. (ietf-tools#3770)
1 parent 300f717 commit cb4a288

1 file changed

Lines changed: 42 additions & 27 deletions

File tree

ietf/templates/group/review_requests.html

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
2424
<th data-sort="type">Type</th>
2525
<th data-sort="date">Requested</th>
2626
<th data-sort="date">Deadline</th>
27-
<th data-sort="reviewer">Reviewer</th>
2827
<th data-sort="state">Document state</th>
2928
<th data-sort="date">IESG Telechat</th>
3029
</tr>
3130
</thead>
32-
{% if unassigned_review_requests %}
3331
<tbody>
3432
<tr class="table-info" id="unassigned-review-requests">
3533
<th colspan="7">Unassigned review requests</th>
@@ -60,22 +58,26 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
6058
title="{{ r.due }} day{{ r.due|pluralize }} past deadline">{{ r.due }} day{{ r.due|pluralize }}</span>
6159
{% endif %}
6260
</td>
63-
<td>
64-
{% if r.reviewer %}
65-
{% person_link r.reviewer.person %}
66-
{% if r.state_id == "accepted" %}<span class="badge bg-success">Accepted</span>{% endif %}
67-
{% if r.reviewer_unavailable %}<span class="badge bg-danger">Unavailable</span>{% endif %}
68-
{% endif %}
69-
</td>
7061
<td>{{ r.doc.friendly_state }}</td>
7162
<td>
7263
{% if r.doc.telechat_date %}{{ r.doc.telechat_date }}{% endif %}
7364
</td>
7465
</tr>
7566
{% endfor %}
7667
</tbody>
77-
{% endif %}
78-
{% if open_review_assignments %}
68+
</table>
69+
<table class="table table-sm table-striped tablesorter">
70+
<thead>
71+
<tr>
72+
<th data-sort="request">Request</th>
73+
<th data-sort="type">Type</th>
74+
<th data-sort="date">Requested</th>
75+
<th data-sort="date">Deadline</th>
76+
<th data-sort="reviewer">Reviewer</th>
77+
<th data-sort="state">Document state</th>
78+
<th data-sort="date">IESG Telechat</th>
79+
</tr>
80+
</thead>
7981
<tbody>
8082
<tr class="table-info" id="open_review_assignments">
8183
<th colspan="7">Open review requests</th>
@@ -111,7 +113,6 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
111113
{% endfor %}
112114
</tbody>
113115
</table>
114-
{% endif %}
115116
<h2 class="mt-5" id="closed-review-requests">Closed review requests and assignments</h2>
116117
<form class="closed-review-filter" action="#closed-review-requests">
117118
Past:
@@ -133,26 +134,19 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
133134
Type
134135
</th>
135136
<th data-sort="date">
136-
Requested/Assigned
137+
Requested
137138
</th>
138139
<th data-sort="date">
139140
Deadline
140141
</th>
141142
<th data-sort="date">
142143
Closed
143144
</th>
144-
<th data-sort="reviewer">
145-
Reviewer
146-
</th>
147145
<th data-sort="state">
148146
State
149147
</th>
150-
<th data-sort="result">
151-
Result
152-
</th>
153148
</tr>
154149
</thead>
155-
{% if closed_review_requests %}
156150
<tbody>
157151
<tr class="table-info">
158152
<th colspan="8">
@@ -180,18 +174,40 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
180174
<td>
181175
{{ r.request_closed_time|date:"Y-m-d" }}
182176
</td>
183-
<td>
184-
</td>
185177
<td>
186178
{{ r.state.name }}
187179
</td>
188-
<td>
189-
</td>
190180
</tr>
191181
{% endfor %}
192182
</tbody>
193-
{% endif %}
194-
{% if closed_review_assignments %}
183+
</table>
184+
<table class="table table-sm table-striped tablesorter">
185+
<thead>
186+
<tr>
187+
<th data-sort="request">Request</th>
188+
<th data-sort="type">
189+
Type
190+
</th>
191+
<th data-sort="date">
192+
Assigned
193+
</th>
194+
<th data-sort="date">
195+
Deadline
196+
</th>
197+
<th data-sort="date">
198+
Closed
199+
</th>
200+
<th data-sort="reviewer">
201+
Reviewer
202+
</th>
203+
<th data-sort="state">
204+
State
205+
</th>
206+
<th data-sort="result">
207+
Result
208+
</th>
209+
</tr>
210+
</thead>
195211
<tbody>
196212
<tr class="table-info">
197213
<th colspan="8">
@@ -231,7 +247,6 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
231247
</tr>
232248
{% endfor %}
233249
</tbody>
234-
{% endif %}
235250
</table>
236251
{% endblock %}
237252
{% block js %}

0 commit comments

Comments
 (0)