Skip to content

fix: Fix layout issue in ballot modals on narrow screens #4911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 4 commits into from
Dec 16, 2022
Merged

fix: Fix layout issue in ballot modals on narrow screens #4911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9887138
fix: Fix layout issue in ballot modals on narrow screens
larseggert Dec 16, 2022
ea4c3ad
Also apply change to old positions
larseggert Dec 16, 2022
ee75387
Fix tests
larseggert Dec 16, 2022
f56f3ee
Use badge to indicate former ADs
larseggert Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ietf/doc/templatetags/ballot_icon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def sort_key(t):
i = i + 1

res.append("</tr></tbody></table></a>")
res.append('<div id="modal-%d" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"><div class="modal-dialog modal-dialog-scrollable modal-xl"><div class="modal-content"></div></div></div>' % ballot.pk)
res.append('<div id="modal-%d" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"><div class="modal-dialog modal-dialog-scrollable modal-xl modal-fullscreen-lg-down"><div class="modal-content"></div></div></div>' % ballot.pk)

return mark_safe("".join(res))

Expand Down
2 changes: 1 addition & 1 deletion ietf/doc/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,7 @@ def test_document_ballot_popup_unique_anchors_per_doc(self):
href = q(f'div.balloter-name a[href$="{author_slug}"]').attr('href')
ids = [
target.attr('id')
for target in q(f'p.h5[id$="{author_slug}"]').items()
for target in q(f'div.h5[id$="{author_slug}"]').items()
]
self.assertEqual(len(ids), 1, 'Should be exactly one link for the balloter')
self.assertEqual(href, f'#{ids[0]}', 'Anchor href should match ID')
Expand Down
6 changes: 3 additions & 3 deletions ietf/doc/tests_ballot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,9 +1198,9 @@ def test_ballotpositiondocevent_any_email_sent(self):
)

def _assertBallotMessage(self, q, balloter, expected):
heading = q(f'p.h5[id$="_{slugify(balloter.plain_name())}"]')
heading = q(f'div.h5[id$="_{slugify(balloter.plain_name())}"]')
self.assertEqual(len(heading), 1)
# <p.h5/> is followed by a panel with the message of interest, so use next()
# <div.h5> is followed by a panel with the message of interest, so use next()
self.assertEqual(
len(heading.next().find(
f'*[title="{expected}"]'
Expand Down Expand Up @@ -1381,4 +1381,4 @@ def test_document_ballot_content_without_send_email_values(self):
q = PyQuery(content)
self._assertBallotMessage(q, balloters[0], 'No email send requests for this discuss')
self._assertBallotMessage(q, balloters[1], 'No ballot position send log available')
self._assertBallotMessage(q, old_balloter, 'No ballot position send log available')
self._assertBallotMessage(q, old_balloter, 'No ballot position send log available')
31 changes: 18 additions & 13 deletions ietf/templates/doc/document_ballot_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% load ietf_filters %}
{% load textfilters %}
<div class="row">
<div class="col-md-2 d-none d-md-block d-sm-block d-lg-block d-xl-block d-xxl-block">
<div class="col-md-2">
{% for n, positions in position_groups %}
<p class="h5">
<span class="badge rounded-pill {{ n|pos_to_label_format }}">{{ n.name }}</span>
Expand Down Expand Up @@ -85,10 +85,12 @@
{% for n, positions in position_groups %}
{% for p in positions %}
{% if not p.is_old_pos %}
<p class="h5 mt-4"
id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
{{ p.balloter.plain_name }}
<span class="float-end">
<div class="h5 d-flex mt-4"
id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
<div class="flex-fill">
{{ p.balloter.plain_name }}
</div>
<div class="flex-fill text-end">
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
<span class="badge rounded-pill {{ p.pos|pos_to_label_format }}">{{ p.pos }}</span>
{% if user|has_role:"Secretariat" %}
Expand All @@ -98,8 +100,8 @@
Edit
</a>
{% endif %}
</span>
</p>
</div>
</div>
{% if p.pos.blocking and p.discuss %}
<div class="card border-danger {% if p.comment %} mb-2{% endif %}">
<div class="card-header bg-danger text-light">
Expand Down Expand Up @@ -158,9 +160,12 @@
{% for n, positions in position_groups %}
{% for p in positions %}
{% if p.is_old_pos %}
<p class="h5 mt-4" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
<span class="text-muted">({{ p.balloter.plain_name }}; former steering group member)</span>
<span class="float-end">
<div class="h5 d-flex mt-4"
id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
<div class="flex-fill text-muted">
{{ p.balloter.plain_name }} <span class="badge rounded-pill bg-secondary">Former IESG member</span>
</div>
<div class="flex-fill text-end">
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
<span class="badge rounded-pill {{ p.pos|pos_to_label_format }}">{{ p.pos }}</span>
{% if user|has_role:"Secretariat" %}
Expand All @@ -170,8 +175,8 @@
Edit
</a>
{% endif %}
</span>
</p>
</div>
</div>
<div class="card {{ p.pos|pos_to_border_format }}">
<div class="card-header {{ p.pos|pos_to_label_format }}">
<div>
Expand Down Expand Up @@ -211,4 +216,4 @@
{% endfor %}
{% endfor %}
</div>
</div>
</div>