diff --git a/ietf/static/js/upcoming.js b/ietf/static/js/upcoming.js
index 0785d02cc75..9ab5821c048 100644
--- a/ietf/static/js/upcoming.js
+++ b/ietf/static/js/upcoming.js
@@ -34,7 +34,7 @@ function filter_calendar_events(filter_params, event_list) {
}
// format a moment in a tz
-var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' };
+var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' , timezone: 'z'};
function format_moment(t_moment, tz, fmt_type) {
return t_moment.tz(tz)
@@ -43,6 +43,9 @@ function format_moment(t_moment, tz, fmt_type) {
function make_display_events(event_data, tz) {
var calendarEl = document.getElementById('calendar');
+ if (!calendarEl) {
+ return;
+ }
var glue = calendarEl.clientWidth > 720 ? ' ' : '\n';
return $.map(event_data, function (src_event) {
var title;
@@ -83,6 +86,9 @@ function update_calendar(tz, filter_params) {
* filtered events.
*/
var calendarEl = document.getElementById('calendar');
+ if (!calendarEl) {
+ return;
+ }
event_calendar = new FullCalendar(calendarEl, {
plugins: [dayGridPlugin, bootstrap5Plugin],
initialView: 'dayGridMonth',
@@ -136,7 +142,7 @@ function format_session_time(session_elt, tz) {
.attr('data-start-utc'));
var end = moment.utc($(session_elt)
.attr('data-end-utc'));
- return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time');
+ return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time') + ' ' + format_moment(start, tz, 'timezone');
}
function format_meeting_time(meeting_elt, tz) {
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 189c635ceb7..3a16cccdb4b 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load static %}
-{% load ietf_filters textfilters %}
+{% load ietf_filters textfilters tz %}
{% block title %}{{ doc.title|default:"Untitled" }}{% endblock %}
{% block content %}
{% origin %}
@@ -29,6 +29,24 @@
{% if snapshot %}Snapshot{% endif %}
+ {% if doc.meeting_related %}
+
+ |
+ Date and time
+ |
+ |
+
+ {% with session=doc.get_related_session %}
+ {% with timeslot=session.official_timeslotassignment.timeslot %}
+ {% if session.meeting %}
+
+ {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix="" minimal=True only %}
+ {% endif %}
+ {% endwith %}
+ {% endwith %}
+ |
+
+ {% endif %}
| Title |
@@ -97,7 +115,21 @@
{% if presentations %}
{% for pres in presentations %}
{{ pres.session.short_name }} at {{ pres.session.meeting }}
- {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
+ {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}
+
+ Remote instructions:
+ {% if pres.session.agenda_note|first_url|conference_url %}
+
+
+
+ {% elif pres.session.remote_instructions|first_url|conference_url %}
+
+
+
+ {% endif %}
+ {{ pres.session.remote_instructions|linkify }}
+ {% if not forloop.last %} {% endif %}
{% endfor %}
{% else %}
(None)
@@ -142,4 +174,16 @@
{% block js %}
+ {% if doc.meeting_related %}
+
+
+
+
+ {% endif %}
{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html
index 487c8f7e1bf..d1775f3cc9c 100644
--- a/ietf/templates/group/meetings-row.html
+++ b/ietf/templates/group/meetings-row.html
@@ -1,7 +1,6 @@
{% load origin tz %}
{% origin %}
{% for s in sessions %}
- {% timezone s.meeting.time_zone %}
|
|
{% if s.meeting.type.slug == 'ietf' %}
@@ -12,9 +11,11 @@
|
{% if s.current_status == "sched" %}
- {{ s.time|date:"Y-m-d" }}
+ {% with timeslot=s.official_timeslotassignment.timeslot %}
+
+ {% endwith %}
{% else %}
- {{ s.current_status_name }}
+ {{ s.current_status_name }}
{% endif %}
{% if show_request and s.meeting.type_id == 'ietf' %}
{% if can_edit %}
@@ -28,9 +29,6 @@
|
{% if s.name %}{{ s.name }}{% endif %}
|
-
- {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %}
- |
{% if show_ical and s.current_status == "sched" %}
{% if s.meeting.type_id == 'ietf' %}
@@ -78,5 +76,4 @@
{% endif %}
|
- {% endtimezone %}
{% endfor %}
\ No newline at end of file
diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html
index a344e74d81d..19f39d6d997 100644
--- a/ietf/templates/group/meetings.html
+++ b/ietf/templates/group/meetings.html
@@ -1,6 +1,5 @@
{% extends "group/group_base.html" %}
-{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
-{% load origin %}
+{% load origin static %}
{% block title %}
Meetings
{% if group %}for {{ group.acronym }}{% endif %}
@@ -19,15 +18,15 @@
{% endblock %}
{% block group_content %}
{% origin %}
+ {% include "meeting/tz-display.html" with meeting_timezone=None id_suffix="" minimal=False only %}
{% if in_progress %}
- Meetings in progress
+ Meetings in progress
{% with sessions=in_progress show_request=True show_ical=True can_edit_materials=can_edit %}
- | Meeting |
- Date |
- |
+ Meeting |
+ Date |
|
Materials |
@@ -39,7 +38,7 @@ Meetings in progress
{% endwith %}
{% endif %}
{% if future %}
-
+
Future Meetings
- | Meeting |
- Date |
- |
+ Meeting |
+ Date |
|
Materials |
@@ -66,13 +64,12 @@
{% endif %}
{% if past or recent %}
- Past Meetings (within the last four years)
+ Past Meetings (within the last four years)
- | Meeting |
- Date |
- |
+ Meeting |
+ Date |
|
Materials |
@@ -100,13 +97,12 @@ Past Meetings (within the last four years)
older_sessions value, this block will need to be adjusted.
{% endcomment %}
{% if far_past %}
- Meetings more than four years ago
+ Meetings more than four years ago
- | Meeting |
- Date |
- |
+ Meeting |
+ Date |
|
Materials |
@@ -160,3 +156,16 @@ Meetings more than four years ago
{% endif %}
{% endif %}
{% endblock %}
+{% block js %}
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 96f42708aaa..571715b4b4d 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -57,6 +57,17 @@
{% endif %}
{% endblock %}
{% block js %}
+
+
+
+
+
{% if can_manage_materials %}