From d6e60a8f8e6691297a6a00219d4c1d0a19c24e70 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Wed, 27 Oct 2021 10:56:05 +0000 Subject: [PATCH] can't have
in it. Fix that. Commit ready for merge. - Legacy-Id: 19469 --- ietf/meeting/tests_views.py | 4 +- ietf/static/ietf/js/agenda/agenda_timezone.js | 4 +- ietf/templates/meeting/agenda.html | 46 +++++++++---------- .../meeting/session_buttons_include.html | 4 +- .../templates/meeting/timeslot_start_end.html | 4 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index eb7a61b1b..5bf237d9d 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -2736,7 +2736,7 @@ class SessionDetailsTests(TestCase): self.assertNotContains(r, 'deleted') q = PyQuery(r.content) - self.assertTrue(q('h2#session_%s span#session-buttons-%s' % (session.id, session.id)), + self.assertTrue(q('h2#session_%s div#session-buttons-%s' % (session.id, session.id)), 'Session detail page does not contain session tool buttons') self.assertFalse(q('h2#session_%s div#session-buttons-%s span.fa-arrows-alt' % (session.id, session.id)), 'The session detail page is incorrectly showing the "Show meeting materials" button') @@ -6205,4 +6205,4 @@ class ProceedingsTests(BaseMeetingTestCase): ) pm = meeting.proceedings_materials.get(pk=pm.pk) self.assertEqual(str(pm), 'This Is Not the Default Name') - self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision') + self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision') \ No newline at end of file diff --git a/ietf/static/ietf/js/agenda/agenda_timezone.js b/ietf/static/ietf/js/agenda/agenda_timezone.js index 1d05a65d2..309876617 100644 --- a/ietf/static/ietf/js/agenda/agenda_timezone.js +++ b/ietf/static/ietf/js/agenda/agenda_timezone.js @@ -127,9 +127,9 @@ function format_tooltip_table(start, end) { // Format tooltip for item function format_tooltip(start, end) { - return '' + + return '
' + format_tooltip_table(start, end) + - ''; + '
'; } // Add tooltips diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 70f6fdbd8..227ad688e 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -127,7 +127,7 @@ {% endif %} - + {% for item in filtered_assignments %} @@ -150,14 +150,14 @@ data-slot-end-ts="{{item.end_timestamp}}"> @@ -172,14 +172,14 @@ data-slot-end-ts="{{item.end_timestamp}}"> {% if item.timeslot.type.slug == 'plenary' %} @@ -280,7 +280,7 @@ {% endif %} - +
- - - - - - {% with item.timeslot.location.floorplan as floor %} {% if item.timeslot.location.floorplan %} - {% if item.session.historic_group %} @@ -317,19 +317,19 @@ {% endif %} {% if item.session.current_status == 'resched' %} - +
RESCHEDULED {% if item.session.rescheduled_to %} TO - +
{% if "-utc" in request.path %} {{ item.session.rescheduled_to.utc_start_time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.utc_end_time|date:"G:i" }} {% else %} {{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }} {% endif %} - +
{% endif %} - +
{% endif %} {% if item.session.agenda_note|first_url|conference_url %} @@ -526,4 +526,4 @@ } ); -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html index 7319ad1f1..ffe273522 100644 --- a/ietf/templates/meeting/session_buttons_include.html +++ b/ietf/templates/meeting/session_buttons_include.html @@ -5,7 +5,7 @@ {% origin %} {% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %} - +
{% with acronym=session.historic_group.acronym %} {% if session.agenda and show_agenda %} {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #} @@ -116,5 +116,5 @@ {% endif %} {% endif %} {% endwith %} - +
{% endwith %}{% endwith %}{% endwith %}{% endwith %} \ No newline at end of file diff --git a/ietf/templates/meeting/timeslot_start_end.html b/ietf/templates/meeting/timeslot_start_end.html index 30f9973ce..8c5e114f9 100644 --- a/ietf/templates/meeting/timeslot_start_end.html +++ b/ietf/templates/meeting/timeslot_start_end.html @@ -1,7 +1,7 @@ - +
{% if "-utc" in request.path %} {{item.timeslot.utc_start_time|date:"H:i"}}-{{item.timeslot.utc_end_time|date:"H:i"}} {% else %} {{item.timeslot.time|date:"H:i"}}-{{item.timeslot.end_time|date:"H:i"}} {% endif %} - +
\ No newline at end of file