Skip to content

feat: Mobile agenda improvements #3655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 3 commits into from
Mar 16, 2022
Merged

feat: Mobile agenda improvements #3655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e876299
fix: Improve agenda page for mobile (narrow) screens
larseggert Mar 15, 2022
3e966f7
Remove unrelated change
larseggert Mar 16, 2022
5b766bb
Remove FIXME
larseggert Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ietf/meeting/tests_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def test_meeting_agenda(self):
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<span.*/span>-%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)
Expand All @@ -172,14 +172,14 @@ def test_meeting_agenda(self):
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<span.*/span>-%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)
Expand All @@ -189,7 +189,7 @@ def test_meeting_agenda(self):
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
Expand All @@ -208,7 +208,7 @@ def test_meeting_agenda(self):

# 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)
Expand Down
6 changes: 3 additions & 3 deletions ietf/static/js/agenda_timezone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
'<span class="d-lg-none"><br></span>-' + format_time(this.end_ts, newtz, 5) + tz);
} else {
$(this)
.html(format_time(this.start_ts, newtz, this.format) +
'-' +
'<span class="d-lg-none"><br></span>-' +
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) + '<span class="d-lg-none"><br></span>-' +
format_time(this.end_ts, newtz, this.format));
}
});
Expand Down
2 changes: 1 addition & 1 deletion ietf/static/js/ietf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ $(function () {
.attr("data-bs-offset", 0)
.attr("tabindex", 0)
.after($(`
<div class="col-xl-2 small">
<div class="col-xl-2 ps-0 small">
<nav id="righthand-nav" class="position-fixed navbar navbar-light bg-light overflow-auto flex-fill" style="height: 70vh; width: inherit;">
</nav>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</ul>
</div>
{% endif %}
<div class="col overflow-hidden mx-3 ietf-auto-nav" id="content">
<div class="col overflow-hidden mx-lg-3 ietf-auto-nav" id="content">
<noscript>
<div class="alert alert-danger alert-ignore my-3">
<b>Javascript disabled?</b> Like other modern websites, the IETF Datatracker relies on Javascript.
Expand Down
8 changes: 4 additions & 4 deletions ietf/templates/meeting/agenda.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ <h2 class="mt-3">
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% with item.timeslot.location.floorplan as floor %}
{% if item.timeslot.location.floorplan %}
<div class="d-none d-sm-block">
<div class="d-none d-sm-block float-end">
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#floor-{{ floor.name|xslugify }}"
class="float-end"
title="{{ floor.name }}">
<span class="badge bg-secondary label-wide">{{ floor.short }}</span>
<span class="badge bg-secondary">{{ floor.short }}</span>
</a>
</div>
{% endif %}
Expand All @@ -161,7 +161,7 @@ <h2 class="mt-3">
{% if item.session.current_status == 'canceled' %}
<span class="badge bg-danger float-end">CANCELLED</span>
{% else %}
<div class="float-end ps-3">
<div class="float-end ps-2">
{% if item.slot_type.slug == 'other' %}
{% if item.session.agenda or item.session.remote_instructions or item.session.agenda_note %}
{% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule %}
Expand Down Expand Up @@ -260,7 +260,7 @@ <h2 class="mt-3">
{% if item.session.current_status == 'canceled' %}
<span class="badge bg-danger float-end">Cancelled</span>
{% else %}
<div class="float-end ps-3">
<div class="float-end ps-2">
{% include "meeting/session_buttons_include.html" with show_agenda=True session=item.session meeting=schedule.meeting %}
</div>
{% endif %}
Expand Down
Loading