Skip to content

Commit baf67d1

Browse files
larseggertlarseggert
authored
fix: Use new schedule editor icons picked by @flynnliz (ietf-tools#4407)
Also clean up the related layout somewhat. Fixes ietf-tools#4378
1 parent 743484f commit baf67d1

4 files changed

Lines changed: 40 additions & 28 deletions

File tree

‎ietf/meeting/templatetags/editor_tags.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ def constraint_icon_for(constraint_name, count=None):
1717
'conflict': '<span class="encircled">{reversed}1</span>',
1818
'conflic2': '<span class="encircled">{reversed}2</span>',
1919
'conflic3': '<span class="encircled">{reversed}3</span>',
20-
'bethere': '<i class="bi bi-person"></i>{count}',
20+
'bethere': '<i class="bi bi-people-fill"></i>{count}',
2121
'timerange': '<i class="bi bi-calendar"></i>',
2222
'time_relation': '&Delta;',
2323
'wg_adjacent': '{reversed}<i class="bi bi-skip-end"></i>',
24-
'chair_conflict': '{reversed}<i class="bi bi-person-circle"></i>',
25-
'tech_overlap': '{reversed}<i class="bi bi-link"></i>',
26-
'key_participant': '{reversed}<i class="bi bi-key"></i>',
24+
'chair_conflict': '{reversed}<i class="bi bi-circle-fill"></i>',
25+
'tech_overlap': '{reversed}<i class="bi bi-link-45deg"></i>',
26+
'key_participant': '{reversed}<i class="bi bi-star"></i>',
2727
'joint_with_groups': '<i class="bi bi-merge"></i>',
2828
'responsible_ad': '<span class="encircled">AD</span>',
2929
}

‎ietf/meeting/templatetags/tests.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ def test_constraint_icon_for(self):
8787
('conflict-reversed', '', '<span class="encircled">-1</span>'),
8888
('conflic2-reversed', '', '<span class="encircled">-2</span>'),
8989
('conflic3-reversed', '', '<span class="encircled">-3</span>'),
90-
('bethere', '27', '<i class="bi bi-person"></i>27'),
90+
('bethere', '27', '<i class="bi bi-people-fill"></i>27'),
9191
('timerange', '', '<i class="bi bi-calendar"></i>'),
9292
('time_relation', '', '\u0394'), # \u0394 is a capital Greek Delta
9393
('wg_adjacent', '', '<i class="bi bi-skip-end"></i>'),
9494
('wg_adjacent-reversed', '', '-<i class="bi bi-skip-end"></i>'),
95-
('chair_conflict', '', '<i class="bi bi-person-circle"></i>'),
96-
('chair_conflict-reversed', '', '-<i class="bi bi-person-circle"></i>'),
97-
('tech_overlap', '', '<i class="bi bi-link"></i>'),
98-
('tech_overlap-reversed', '', '-<i class="bi bi-link"></i>'),
99-
('key_participant', '', '<i class="bi bi-key"></i>'),
100-
('key_participant-reversed', '', '-<i class="bi bi-key"></i>'),
95+
('chair_conflict', '', '<i class="bi bi-circle-fill"></i>'),
96+
('chair_conflict-reversed', '', '-<i class="bi bi-circle-fill"></i>'),
97+
('tech_overlap', '', '<i class="bi bi-link-45deg"></i>'),
98+
('tech_overlap-reversed', '', '-<i class="bi bi-link-45deg"></i>'),
99+
('key_participant', '', '<i class="bi bi-star"></i>'),
100+
('key_participant-reversed', '', '-<i class="bi bi-star"></i>'),
101101
('joint_with_groups', '', '<i class="bi bi-merge"></i>'),
102102
('responsible_ad', '', '<span class="encircled">AD</span>'),
103103
)

‎ietf/meeting/tests_views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3326,7 +3326,7 @@ def test_edit_meeting_schedule(self):
33263326
s_other = s2 if s == s1 else s1
33273327
self.assertEqual(len(constraints), 3)
33283328
self.assertEqual(constraints.eq(0).attr("data-sessions"), str(s_other.pk))
3329-
self.assertEqual(constraints.eq(0).find(".bi-person").parent().text(), "1") # 1 person in the constraint
3329+
self.assertEqual(constraints.eq(0).find(".bi-people-fill").parent().text(), "1") # 1 person in the constraint
33303330
self.assertEqual(constraints.eq(1).attr("data-sessions"), str(s_other.pk))
33313331
self.assertEqual(constraints.eq(1).find(".encircled").text(), "1" if s_other == s2 else "-1")
33323332
self.assertEqual(constraints.eq(2).attr("data-sessions"), str(s_other.pk))
@@ -3662,7 +3662,7 @@ def test_edit_meeting_schedule_conflict_types(self):
36623662

36633663
# Now enable the 'chair_conflict' constraint only
36643664
chair_conflict = ConstraintName.objects.get(slug='chair_conflict')
3665-
chair_conf_label = b'<i class="bi bi-person-circle"/>' # result of etree.tostring(etree.fromstring(editor_label))
3665+
chair_conf_label = b'<i class="bi bi-circle-fill"/>' # result of etree.tostring(etree.fromstring(editor_label))
36663666
meeting.group_conflict_types.add(chair_conflict)
36673667
r = self.client.get(url)
36683668
q = PyQuery(r.content)

‎ietf/templates/meeting/edit_meeting_schedule_session.html‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,47 @@
4747
{% if not session.on_agenda %}&middot; <i>off agenda</i>{% endif %}
4848
</div>
4949
{% endif %}
50+
{% if session.comments %}<div class="comments">{{ session.comments|linebreaksbr }}</div>{% endif %}
5051
{% if session.requested_by_person %}
51-
<div>
52-
<i title="Requested by" class="bi bi-person-circle"></i> {% person_link session.requested_by_person %}
53-
{% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %}
52+
<div class="row">
53+
<div class="col-1">
54+
<i title="Requested by" class="bi bi-person-circle"></i>
55+
</div>
56+
<div class="col">
57+
{% person_link session.requested_by_person %}
58+
{% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %}
59+
</div>
5460
</div>
5561
{% endif %}
5662
{% if session.resources.all %}
57-
<div>
58-
Resources:
59-
{% for r in session.resources.all %}
60-
{{ r.name }}{% if not forloop.last %},{% endif %}
61-
{% endfor %}
63+
<div class="row">
64+
<div class="col-1"><i class="bi bi-layers-fill" title="Resources"></i></div>
65+
<div class="col">
66+
{% for r in session.resources.all %}
67+
{{ r.name }}{% if not forloop.last %}, {% endif %}
68+
{% endfor %}
69+
</div>
6270
</div>
6371
{% endif %}
64-
{% if session.comments %}<div class="comments">{{ session.comments|linebreaksbr }}</div>{% endif %}
6572
{% if session.formatted_constraints %}
6673
<div class="formatted-constraints">
6774
{% for constraint_name, values in session.formatted_constraints.items %}
68-
<div>
69-
<span title="{{ constraint_name.name }}">{% constraint_icon_for constraint_name %}</span>: {{ values|join:", " }}
75+
<div class="row">
76+
<div class="col-1" title="{{ constraint_name.name }}">{% constraint_icon_for constraint_name %}</div><div class="col">{{ values|join:", " }}</div>
7077
</div>
7178
{% endfor %}
7279
</div>
7380
{% endif %}
7481
{% for s in session.other_sessions %}
75-
<div class="other-session" data-othersessionid="{{ s.pk }}">
76-
<i class="bi bi-calendar"></i> Other session <span class="time"
77-
data-scheduled="scheduled: {time}"
78-
data-notscheduled="not yet scheduled"></span>
82+
<div class="other-session row" data-othersessionid="{{ s.pk }}">
83+
<div class="col-1">
84+
<i class="bi bi-calendar" title="Other session"></i>
85+
</div>
86+
<div class="col">
87+
<span class="time"
88+
data-scheduled="scheduled: {time}"
89+
data-notscheduled="not yet scheduled"></span>
90+
</div>
7991
</div>
8092
{% endfor %}
8193
<a class="btn btn-primary btn-sm mt-2"

0 commit comments

Comments
 (0)