diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 9c1b3fedc..a77884122 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -162,7 +162,7 @@ class MeetingTests(BaseMeetingTestCase): registration_text = "Registration" # utc - time_interval = "%s-%s" % (slot.utc_start_time().strftime("%H:%M").lstrip("0"), (slot.utc_start_time() + slot.duration).strftime("%H:%M").lstrip("0")) + time_interval = r"%s-%s" % (slot.utc_start_time().strftime("%H:%M").lstrip("0"), (slot.utc_start_time() + slot.duration).strftime("%H:%M").lstrip("0")) r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number,utc='-utc'))) self.assertEqual(r.status_code, 200) @@ -172,14 +172,14 @@ class MeetingTests(BaseMeetingTestCase): self.assertIn(session.group.name, agenda_content) self.assertIn(session.group.parent.acronym.upper(), agenda_content) self.assertIn(slot.location.name, agenda_content) - self.assertIn(time_interval, agenda_content) + self.assertRegex(agenda_content, time_interval) self.assertIsNotNone(q(':input[value="%s"]' % meeting.time_zone), 'Time zone selector should show meeting timezone') self.assertIsNotNone(q('.nav *:contains("%s")' % meeting.time_zone), 'Time zone indicator should be in nav sidebar') # plain - time_interval = "%s-%s" % (slot.time.strftime("%H:%M").lstrip("0"), (slot.time + slot.duration).strftime("%H:%M").lstrip("0")) + time_interval = r"%s-%s" % (slot.time.strftime("%H:%M").lstrip("0"), (slot.time + slot.duration).strftime("%H:%M").lstrip("0")) r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number))) self.assertEqual(r.status_code, 200) @@ -189,7 +189,7 @@ class MeetingTests(BaseMeetingTestCase): self.assertIn(session.group.name, agenda_content) self.assertIn(session.group.parent.acronym.upper(), agenda_content) self.assertIn(slot.location.name, agenda_content) - self.assertIn(time_interval, agenda_content) + self.assertRegex(agenda_content, time_interval) self.assertIn(registration_text, agenda_content) # Make sure there's a frame for the session agenda and it points to the right place @@ -208,7 +208,7 @@ class MeetingTests(BaseMeetingTestCase): # text # the rest of the results don't have as nicely formatted times - time_interval = time_interval.replace(":", "") + time_interval = "%s-%s" % (slot.time.strftime("%H%M").lstrip("0"), (slot.time + slot.duration).strftime("%H%M").lstrip("0")) r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number, ext=".txt"))) self.assertContains(r, session.group.acronym) diff --git a/ietf/static/js/agenda_timezone.js b/ietf/static/js/agenda_timezone.js index ea55a3cec..ac15db8b4 100644 --- a/ietf/static/js/agenda_timezone.js +++ b/ietf/static/js/agenda_timezone.js @@ -191,16 +191,16 @@ window.update_times = function (newtz) { .dayOfYear()) { $(this) .html(format_time(this.start_ts, newtz, this.format) + - '-' + format_time(this.end_ts, newtz, 5) + tz); + '
-' + format_time(this.end_ts, newtz, 5) + tz); } else { $(this) .html(format_time(this.start_ts, newtz, this.format) + - '-' + + '
-' + format_time(this.end_ts, newtz, this.format) + tz); } } else { $(this) - .html(format_time(this.start_ts, newtz, this.format) + '-' + + .html(format_time(this.start_ts, newtz, this.format) + '
-' + format_time(this.end_ts, newtz, this.format)); } }); diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js index 9cbc0ad01..9a98b38fd 100644 --- a/ietf/static/js/ietf.js +++ b/ietf/static/js/ietf.js @@ -138,7 +138,7 @@ $(function () { .attr("data-bs-offset", 0) .attr("tabindex", 0) .after($(` -
+
diff --git a/ietf/templates/base.html b/ietf/templates/base.html index ac9d595db..959b6f98b 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -84,7 +84,7 @@
{% endif %} -
+