diff --git a/ietf/meeting/templatetags/editor_tags.py b/ietf/meeting/templatetags/editor_tags.py index c972fab6e..b30e14f49 100644 --- a/ietf/meeting/templatetags/editor_tags.py +++ b/ietf/meeting/templatetags/editor_tags.py @@ -17,13 +17,13 @@ def constraint_icon_for(constraint_name, count=None): 'conflict': '{reversed}1', 'conflic2': '{reversed}2', 'conflic3': '{reversed}3', - 'bethere': '{count}', + 'bethere': '{count}', 'timerange': '', 'time_relation': 'Δ', 'wg_adjacent': '{reversed}', - 'chair_conflict': '{reversed}', - 'tech_overlap': '{reversed}', - 'key_participant': '{reversed}', + 'chair_conflict': '{reversed}', + 'tech_overlap': '{reversed}', + 'key_participant': '{reversed}', 'joint_with_groups': '', 'responsible_ad': 'AD', } diff --git a/ietf/meeting/templatetags/tests.py b/ietf/meeting/templatetags/tests.py index 22cfc3567..5093ecd4b 100644 --- a/ietf/meeting/templatetags/tests.py +++ b/ietf/meeting/templatetags/tests.py @@ -87,17 +87,17 @@ class EditorTagsTests(TestCase): ('conflict-reversed', '', '-1'), ('conflic2-reversed', '', '-2'), ('conflic3-reversed', '', '-3'), - ('bethere', '27', '27'), + ('bethere', '27', '27'), ('timerange', '', ''), ('time_relation', '', '\u0394'), # \u0394 is a capital Greek Delta ('wg_adjacent', '', ''), ('wg_adjacent-reversed', '', '-'), - ('chair_conflict', '', ''), - ('chair_conflict-reversed', '', '-'), - ('tech_overlap', '', ''), - ('tech_overlap-reversed', '', '-'), - ('key_participant', '', ''), - ('key_participant-reversed', '', '-'), + ('chair_conflict', '', ''), + ('chair_conflict-reversed', '', '-'), + ('tech_overlap', '', ''), + ('tech_overlap-reversed', '', '-'), + ('key_participant', '', ''), + ('key_participant-reversed', '', '-'), ('joint_with_groups', '', ''), ('responsible_ad', '', 'AD'), ) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index b5df0809b..785cf8fcc 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -3326,7 +3326,7 @@ class EditTests(TestCase): s_other = s2 if s == s1 else s1 self.assertEqual(len(constraints), 3) 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).find(".encircled").text(), "1" if s_other == s2 else "-1") 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 chair_conflict = ConstraintName.objects.get(slug='chair_conflict') - chair_conf_label = b'' # result of etree.tostring(etree.fromstring(editor_label)) + chair_conf_label = b'' # result of etree.tostring(etree.fromstring(editor_label)) meeting.group_conflict_types.add(chair_conflict) r = self.client.get(url) q = PyQuery(r.content) diff --git a/ietf/templates/meeting/edit_meeting_schedule_session.html b/ietf/templates/meeting/edit_meeting_schedule_session.html index 80bab3d1b..7f2c3bd9a 100644 --- a/ietf/templates/meeting/edit_meeting_schedule_session.html +++ b/ietf/templates/meeting/edit_meeting_schedule_session.html @@ -47,35 +47,47 @@ {% if not session.on_agenda %}· off agenda{% endif %} {% endif %} + {% if session.comments %}
{{ session.comments|linebreaksbr }}
{% endif %} {% if session.requested_by_person %} -
- {% person_link session.requested_by_person %} - {% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %} +
+
+ +
+
+ {% person_link session.requested_by_person %} + {% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %} +
{% endif %} {% if session.resources.all %} -
- Resources: - {% for r in session.resources.all %} - {{ r.name }}{% if not forloop.last %},{% endif %} - {% endfor %} +
+
+
+ {% for r in session.resources.all %} + {{ r.name }}{% if not forloop.last %}, {% endif %} + {% endfor %} +
{% endif %} - {% if session.comments %}
{{ session.comments|linebreaksbr }}
{% endif %} {% if session.formatted_constraints %}
{% for constraint_name, values in session.formatted_constraints.items %} -
- {% constraint_icon_for constraint_name %}: {{ values|join:", " }} +
+
{% constraint_icon_for constraint_name %}
{{ values|join:", " }}
{% endfor %}
{% endif %} {% for s in session.other_sessions %} -
- Other session +
+
+ +
+
+ +
{% endfor %}