Skip to content

Commit db254f7

Browse files
fix: tweak review assignment tooltips and control row height (ietf-tools#3788)
1 parent 6867b1b commit db254f7

2 files changed

Lines changed: 31 additions & 15 deletions

File tree

ietf/static/js/manage-review-requests.js

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,36 @@ $(function () {
1313

1414
function setControlDisplay (row) {
1515
const action = row.find('[name$="-action"]').val()
16+
const reviewerControls = row.find('.reviewer-controls')
17+
const reviewerButtons = reviewerControls.find('button')
18+
const closeControls = row.find('.close-controls')
19+
const closeButtons = reviewerControls.find('button')
20+
const actionElements = row.find('.assign-action,.close-action')
21+
const actionButtons = actionElements.find('button')
22+
1623
switch (action) {
1724
case 'assign':
18-
row.find('.reviewer-controls').show()
19-
row.find('.close-controls').hide()
20-
row.find('.assign-action,.close-action').hide()
25+
reviewerControls.show()
26+
closeButtons.tooltip('hide')
27+
closeControls.hide()
28+
actionButtons.tooltip('hide')
29+
actionElements.hide()
2130
break
2231

2332
case 'close':
24-
row.find('.reviewer-controls').hide()
25-
row.find('.close-controls').show()
26-
row.find('.assign-action,.close-action').hide()
33+
reviewerButtons.tooltip('hide')
34+
reviewerControls.hide()
35+
closeControls.show()
36+
actionButtons.tooltip('hide')
37+
actionElements.hide()
2738
break
2839

2940
default:
30-
row.find('.reviewer-controls,.close-controls').hide()
31-
row.find('.assign-action,.close-action').show()
41+
closeButtons.tooltip('hide')
42+
closeControls.hide()
43+
reviewerButtons.tooltip('hide')
44+
reviewerControls.hide()
45+
actionElements.show()
3246
}
3347

3448
updateSaveButtons()

ietf/templates/group/manage_review_requests.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,16 @@ <h1>
184184
{% if r.form.review_type %}
185185
{% bootstrap_field r.form.review_type layout="horizontal" wrapper_class="col" size="sm" %}
186186
{% endif %}
187-
{% bootstrap_field r.form.reviewer layout="horizontal" wrapper_class="col row" size="sm" %}
187+
{% bootstrap_field r.form.reviewer layout="horizontal" wrapper_class="col row" label_class="p-0" size="sm" %}
188188
{% bootstrap_field r.form.add_skip layout="horizontal" wrapper_class="col col-2" size="sm" %}
189-
<button type="button"
190-
class="btn btn-sm btn-primary undo col col-1"
191-
title="Cancel assignment"
192-
data-initial="{{ r.form.fields.reviewer.initial|default:"" }}">
193-
Cancel
194-
</button>
189+
<div class="col col-1">
190+
<button type="button"
191+
class="btn btn-sm btn-primary undo"
192+
title="Cancel assignment"
193+
data-initial="{{ r.form.fields.reviewer.initial|default:"" }}">
194+
Cancel
195+
</button>
196+
</div>
195197
{% if r.form.reviewer.errors or r.form.add_skip.errors %}
196198
<div class="alert alert-danger my-3">
197199
{% for e in r.form.reviewer.errors %}{{ e }}{% endfor %}

0 commit comments

Comments
 (0)