From b74ce877f85a657a3180204461537a25dcdcf7db Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 3 Apr 2020 09:19:34 +0000 Subject: [PATCH] Added links to agenda/materials pop-up, materials download, etherpad, jabber room, and webex call-in session for interims on the upcoming meetings page. With the earlier changes from [17555], this fixes issue #2937. - Legacy-Id: 17576 Note: SVN reference [17555] has been migrated to Git commit e9756d89871499949e3e8668a103d6cd69610aa8 --- ietf/meeting/models.py | 4 +- ietf/meeting/urls.py | 4 +- ietf/meeting/views.py | 2 + .../meeting/interim_session_buttons.html | 42 +++++++++++++++++++ .../meeting/session_agenda_include.html | 4 +- ietf/templates/meeting/upcoming.html | 42 +++++++++++++++++-- 6 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 ietf/templates/meeting/interim_session_buttons.html diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index e3d254aad..641b84ab1 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -783,13 +783,15 @@ class SchedTimeSessAssignment(models.Model): """Return sensible id string for session, e.g. suitable for use as HTML anchor.""" components = [] + components.append(self.schedule.meeting.number) + if not self.timeslot: components.append("unknown") if not self.session or not (getattr(self.session, "historic_group") or self.session.group): components.append("unknown") else: - components.append(self.timeslot.time.strftime("%a-%H%M")) + components.append(self.timeslot.time.strftime("%Y-%m-%d-%a-%H%M")) g = getattr(self.session, "historic_group", None) or self.session.group diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index ad3b967bf..89f546648 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -66,8 +66,8 @@ type_ietf_only_patterns = [ # This is a limited subset of the list above -- many of the views above won't work for interim meetings type_interim_patterns = [ - url(r'^agenda/(?P[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf), - url(r'^agenda/(?P[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile), + url(r'^agenda/(?P[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf), + url(r'^agenda/(?P[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile), url(r'^materials/%(document)s((?P\.[a-z0-9]+)|/)?$' % settings.URL_REGEXPS, views.materials_document), url(r'^agenda.json$', views.json_agenda) ] diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 6be138cf2..9433a81ec 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -2246,6 +2246,8 @@ def upcoming(request): timeslotassignments__timeslot__time__gte=today ) ).filter(current_status__in=('sched','canceled')) + for session in interim_sessions: + session.historic_group = session.group entries = list(ietf_meetings) entries.extend(list(interim_sessions)) diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html new file mode 100644 index 000000000..f8f78289c --- /dev/null +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -0,0 +1,42 @@ +{# Copyright The IETF Trust 2015, All Rights Reserved #} +{% load textfilters %} +{% load origin %} + {% origin %} + {% if session.agenda %} + {% with session.official_timeslotassignment as item %} + {% include "meeting/session_agenda_include.html" %} + + + + + + + {% endwith %} + {% endif %} + + + + + + {% if "https://ietf.webex.com" in session.agenda_note|first_url %} + + + {% elif "https://ietf.webex.com" in session.remote_instructions|first_url %} + + + {% elif item.timeslot.location.webex_url %} + + + {% else %} + + + + {% endif %} + diff --git a/ietf/templates/meeting/session_agenda_include.html b/ietf/templates/meeting/session_agenda_include.html index 3e9719f31..18a094698 100644 --- a/ietf/templates/meeting/session_agenda_include.html +++ b/ietf/templates/meeting/session_agenda_include.html @@ -1,9 +1,9 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} +{% load origin %}{% origin %} {% load staticfiles %} {% load textfilters %} {% load ietf_filters %} -