altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: Use new schedule editor icons picked by @flynnliz (#4407)

Browse source 
Also clean up the related layout somewhat.

Fixes #4378
This commit is contained in:
Lars Eggert 2022-09-06 20:11:59 +03:00 committed by GitHub
parent 743484fb4c
commit baf67d1cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ietf/meeting/templatetags/editor_tags.py
View file

@ -17,13 +17,13 @@ def constraint_icon_for(constraint_name, count=None):
'conflict': '<span class="encircled">{reversed}1</span>', 'conflict': '<span class="encircled">{reversed}1</span>',
'conflic2': '<span class="encircled">{reversed}2</span>', 'conflic2': '<span class="encircled">{reversed}2</span>',
'conflic3': '<span class="encircled">{reversed}3</span>', 'conflic3': '<span class="encircled">{reversed}3</span>',
'bethere': '<i class="bi bi-person"></i>{count}', 'bethere': '<i class="bi bi-people-fill"></i>{count}',
'timerange': '<i class="bi bi-calendar"></i>', 'timerange': '<i class="bi bi-calendar"></i>',
'time_relation': '&Delta;', 'time_relation': '&Delta;',
'wg_adjacent': '{reversed}<i class="bi bi-skip-end"></i>', 'wg_adjacent': '{reversed}<i class="bi bi-skip-end"></i>',
'chair_conflict': '{reversed}<i class="bi bi-person-circle"></i>', 'chair_conflict': '{reversed}<i class="bi bi-circle-fill"></i>',
'tech_overlap': '{reversed}<i class="bi bi-link"></i>', 'tech_overlap': '{reversed}<i class="bi bi-link-45deg"></i>',
'key_participant': '{reversed}<i class="bi bi-key"></i>', 'key_participant': '{reversed}<i class="bi bi-star"></i>',
'joint_with_groups': '<i class="bi bi-merge"></i>', 'joint_with_groups': '<i class="bi bi-merge"></i>',
'responsible_ad': '<span class="encircled">AD</span>', 'responsible_ad': '<span class="encircled">AD</span>',
} }

14
ietf/meeting/templatetags/tests.py
View file

@ -87,17 +87,17 @@ class EditorTagsTests(TestCase):
('conflict-reversed', '', '<span class="encircled">-1</span>'), ('conflict-reversed', '', '<span class="encircled">-1</span>'),
('conflic2-reversed', '', '<span class="encircled">-2</span>'), ('conflic2-reversed', '', '<span class="encircled">-2</span>'),
('conflic3-reversed', '', '<span class="encircled">-3</span>'), ('conflic3-reversed', '', '<span class="encircled">-3</span>'),
('bethere', '27', '<i class="bi bi-person"></i>27'), ('bethere', '27', '<i class="bi bi-people-fill"></i>27'),
('timerange', '', '<i class="bi bi-calendar"></i>'), ('timerange', '', '<i class="bi bi-calendar"></i>'),
('time_relation', '', '\u0394'), # \u0394 is a capital Greek Delta ('time_relation', '', '\u0394'), # \u0394 is a capital Greek Delta
('wg_adjacent', '', '<i class="bi bi-skip-end"></i>'), ('wg_adjacent', '', '<i class="bi bi-skip-end"></i>'),
('wg_adjacent-reversed', '', '-<i class="bi bi-skip-end"></i>'), ('wg_adjacent-reversed', '', '-<i class="bi bi-skip-end"></i>'),
('chair_conflict', '', '<i class="bi bi-person-circle"></i>'), ('chair_conflict', '', '<i class="bi bi-circle-fill"></i>'),
('chair_conflict-reversed', '', '-<i class="bi bi-person-circle"></i>'), ('chair_conflict-reversed', '', '-<i class="bi bi-circle-fill"></i>'),
('tech_overlap', '', '<i class="bi bi-link"></i>'), ('tech_overlap', '', '<i class="bi bi-link-45deg"></i>'),
('tech_overlap-reversed', '', '-<i class="bi bi-link"></i>'), ('tech_overlap-reversed', '', '-<i class="bi bi-link-45deg"></i>'),
('key_participant', '', '<i class="bi bi-key"></i>'), ('key_participant', '', '<i class="bi bi-star"></i>'),
('key_participant-reversed', '', '-<i class="bi bi-key"></i>'), ('key_participant-reversed', '', '-<i class="bi bi-star"></i>'),
('joint_with_groups', '', '<i class="bi bi-merge"></i>'), ('joint_with_groups', '', '<i class="bi bi-merge"></i>'),
('responsible_ad', '', '<span class="encircled">AD</span>'), ('responsible_ad', '', '<span class="encircled">AD</span>'),
) )

4
ietf/meeting/tests_views.py
View file

@ -3326,7 +3326,7 @@ class EditTests(TestCase):
s_other = s2 if s == s1 else s1 s_other = s2 if s == s1 else s1
self.assertEqual(len(constraints), 3) self.assertEqual(len(constraints), 3)
self.assertEqual(constraints.eq(0).attr("data-sessions"), str(s_other.pk)) self.assertEqual(constraints.eq(0).attr("data-sessions"), str(s_other.pk))
self.assertEqual(constraints.eq(0).find(".bi-person").parent().text(), "1") # 1 person in the constraint self.assertEqual(constraints.eq(0).find(".bi-people-fill").parent().text(), "1") # 1 person in the constraint
self.assertEqual(constraints.eq(1).attr("data-sessions"), str(s_other.pk)) self.assertEqual(constraints.eq(1).attr("data-sessions"), str(s_other.pk))
self.assertEqual(constraints.eq(1).find(".encircled").text(), "1" if s_other == s2 else "-1") self.assertEqual(constraints.eq(1).find(".encircled").text(), "1" if s_other == s2 else "-1")
self.assertEqual(constraints.eq(2).attr("data-sessions"), str(s_other.pk)) self.assertEqual(constraints.eq(2).attr("data-sessions"), str(s_other.pk))
@ -3662,7 +3662,7 @@ class EditTests(TestCase):
# Now enable the 'chair_conflict' constraint only # Now enable the 'chair_conflict' constraint only
chair_conflict = ConstraintName.objects.get(slug='chair_conflict') chair_conflict = ConstraintName.objects.get(slug='chair_conflict')
chair_conf_label = b'<i class="bi bi-person-circle"/>' # result of etree.tostring(etree.fromstring(editor_label)) chair_conf_label = b'<i class="bi bi-circle-fill"/>' # result of etree.tostring(etree.fromstring(editor_label))
meeting.group_conflict_types.add(chair_conflict) meeting.group_conflict_types.add(chair_conflict)
r = self.client.get(url) r = self.client.get(url)
q = PyQuery(r.content) q = PyQuery(r.content)

42
ietf/templates/meeting/edit_meeting_schedule_session.html
View file

@ -47,35 +47,47 @@
{% if not session.on_agenda %}&middot; <i>off agenda</i>{% endif %} {% if not session.on_agenda %}&middot; <i>off agenda</i>{% endif %}
</div> </div>
{% endif %} {% endif %}
{% if session.comments %}<div class="comments">{{ session.comments|linebreaksbr }}</div>{% endif %}
{% if session.requested_by_person %} {% if session.requested_by_person %}
<div> <div class="row">
<i title="Requested by" class="bi bi-person-circle"></i> {% person_link session.requested_by_person %} <div class="col-1">
{% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %} <i title="Requested by" class="bi bi-person-circle"></i>
</div>
<div class="col">
{% person_link session.requested_by_person %}
{% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %}
</div>
</div> </div>
{% endif %} {% endif %}
{% if session.resources.all %} {% if session.resources.all %}
<div> <div class="row">
Resources: <div class="col-1"><i class="bi bi-layers-fill" title="Resources"></i></div>
{% for r in session.resources.all %} <div class="col">
{{ r.name }}{% if not forloop.last %},{% endif %} {% for r in session.resources.all %}
{% endfor %} {{ r.name }}{% if not forloop.last %}, {% endif %}
{% endfor %}
</div>
</div> </div>
{% endif %} {% endif %}
{% if session.comments %}<div class="comments">{{ session.comments|linebreaksbr }}</div>{% endif %}
{% if session.formatted_constraints %} {% if session.formatted_constraints %}
<div class="formatted-constraints"> <div class="formatted-constraints">
{% for constraint_name, values in session.formatted_constraints.items %} {% for constraint_name, values in session.formatted_constraints.items %}
<div> <div class="row">
<span title="{{ constraint_name.name }}">{% constraint_icon_for constraint_name %}</span>: {{ values|join:", " }} <div class="col-1" title="{{ constraint_name.name }}">{% constraint_icon_for constraint_name %}</div><div class="col">{{ values|join:", " }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
{% for s in session.other_sessions %} {% for s in session.other_sessions %}
<div class="other-session" data-othersessionid="{{ s.pk }}"> <div class="other-session row" data-othersessionid="{{ s.pk }}">
<i class="bi bi-calendar"></i> Other session <span class="time" <div class="col-1">
data-scheduled="scheduled: {time}" <i class="bi bi-calendar" title="Other session"></i>
data-notscheduled="not yet scheduled"></span> </div>
<div class="col">
<span class="time"
data-scheduled="scheduled: {time}"
data-notscheduled="not yet scheduled"></span>
</div>
</div> </div>
{% endfor %} {% endfor %}
<a class="btn btn-primary btn-sm mt-2" <a class="btn btn-primary btn-sm mt-2"