From 1af3ceb628864b497757d3202708bad73fdb59b8 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 6 Oct 2023 13:45:38 +0300
Subject: [PATCH 1/8] fix: Add remote instructions to interim agenda page

Fixes #6433
Fixes #6249
---
 ietf/templates/doc/document_material.html | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 189c635ceb7..246344f76e8 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -97,7 +97,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 %}
+                                    <br>
+                                    <b>Remote instructions:</b>
+                                    {% if pres.session.agenda_note|first_url|conference_url %}
+                                        <a href="{{ pres.session.agenda_note|first_url }}" title="Online conference">
+                                            <i class="bi bi-beople"></i>
+                                        </a>
+                                    {% elif pres.session.remote_instructions|first_url|conference_url %}
+                                        <a href="{{ pres.session.remote_instructions|first_url }}"
+                                           title="Online conference">
+                                            <i class="bi bi-people"></i>
+                                        </a>
+                                    {% endif %}
+                                    {{ pres.session.remote_instructions|linkify }}
+                                    {% if not forloop.last %}<br>{% endif %}
                                 {% endfor %}
                             {% else %}
                                 <span class="text-body-secondary">(None)</span>

From 88fe1a4811e7a8e9b0e30f45800a7fc4c81f4e8a Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 6 Oct 2023 14:38:21 +0300
Subject: [PATCH 2/8] Also add date and time

---
 ietf/templates/doc/document_material.html | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 246344f76e8..710138ed000 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 %}
@@ -28,7 +28,21 @@
                     {% endif %}
                     {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
-            </tr>
+            {% if doc.meeting_related %}
+                </tr>
+                    <th scope="row">
+                        Date and time
+                    </th>
+                    <td></td>
+                    <td>
+                        {% with session=doc.get_related_session %}
+                        {% with timeslot=session.official_timeslotassignment.timeslot %}
+                            {{ timeslot.time|timezone:session.meeting.time_zone|date:"D Y-m-d H:i" }}–{{ timeslot.end_time|timezone:session.meeting.time_zone|date:"H:i" }} {{ session.meeting.time_zone }}
+                        {% endwith %}
+                        {% endwith %}
+                    </td>
+                </tr>
+            {% endif %}
             <tr>
                 <th scope="row">Title</th>
                 <td class="edit">

From 0c3f1b7360f67a8d2efe7376b97d57f5b3f71f41 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 6 Oct 2023 15:20:30 +0300
Subject: [PATCH 3/8] Fix HTML

---
 ietf/templates/doc/document_material.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 710138ed000..8fdf1dcf3ca 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -28,8 +28,9 @@
                     {% endif %}
                     {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
+            </tr>
             {% if doc.meeting_related %}
-                </tr>
+                <tr>
                     <th scope="row">
                         Date and time
                     </th>

From e032fa07feba1f0548df8785c99ac98db08e9d83 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Fri, 6 Oct 2023 16:26:47 +0300
Subject: [PATCH 4/8] Fix CI fail

---
 ietf/templates/doc/document_material.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 8fdf1dcf3ca..f6e3212ac8e 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -38,7 +38,9 @@
                     <td>
                         {% with session=doc.get_related_session %}
                         {% with timeslot=session.official_timeslotassignment.timeslot %}
-                            {{ timeslot.time|timezone:session.meeting.time_zone|date:"D Y-m-d H:i" }}–{{ timeslot.end_time|timezone:session.meeting.time_zone|date:"H:i" }} {{ session.meeting.time_zone }}
+                            {% if session.meeting %}
+                                {{ timeslot.time|timezone:session.meeting.time_zone|date:"D Y-m-d H:i" }}–{{ timeslot.end_time|timezone:session.meeting.time_zone|date:"H:i" }} {{ session.meeting.time_zone }}
+                            {% endif %}
                         {% endwith %}
                         {% endwith %}
                     </td>

From 2866eea562420bb3148a8b27976b840a7fa0f57b Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 11 Oct 2023 10:00:00 +0300
Subject: [PATCH 5/8] Address code review comments

---
 ietf/static/js/upcoming.js                |  6 +++
 ietf/templates/doc/document_material.html | 15 +++++++-
 ietf/templates/group/meetings-row.html    | 11 ++----
 ietf/templates/group/meetings.html        | 45 ++++++++++++++---------
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/ietf/static/js/upcoming.js b/ietf/static/js/upcoming.js
index 0785d02cc75..4d7a82cc034 100644
--- a/ietf/static/js/upcoming.js
+++ b/ietf/static/js/upcoming.js
@@ -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',
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index f6e3212ac8e..3a16cccdb4b 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -39,7 +39,8 @@
                         {% with session=doc.get_related_session %}
                         {% with timeslot=session.official_timeslotassignment.timeslot %}
                             {% if session.meeting %}
-                                {{ timeslot.time|timezone:session.meeting.time_zone|date:"D Y-m-d H:i" }}–{{ timeslot.end_time|timezone:session.meeting.time_zone|date:"H:i" }} {{ session.meeting.time_zone }}
+                                <span class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
+                                {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix="" minimal=True only %}
                             {% endif %}
                         {% endwith %}
                         {% endwith %}
@@ -173,4 +174,16 @@
 {% block js %}
     <script src="{% static 'ietf/js/d3.js' %}"></script>
     <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
+    {% if doc.meeting_related %}
+        <script src="{% static 'ietf/js/moment.js' %}"></script>
+        <script src="{% static 'ietf/js/upcoming.js' %}"></script>
+        <script src="{% static 'ietf/js/timezone.js' %}"></script>
+        <script>
+        $(function () {
+                // Init with best guess at local timezone.
+                ietf_timezone.set_tz_change_callback(timezone_changed);
+                ietf_timezone.initialize('local');
+        });
+        </script>
+    {% 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 %}
     <tr>
         <td>
             {% if s.meeting.type.slug == 'ietf' %}
@@ -12,9 +11,11 @@
         </td>
         <td>
             {% if s.current_status == "sched" %}
-                {{ s.time|date:"Y-m-d" }}
+                {% with timeslot=s.official_timeslotassignment.timeslot %}
+                <span class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
+                {% endwith %}
             {% else %}
-                <i>{{ s.current_status_name }}</i>
+                <div class="badge rounded-pill text-bg-secondary">{{ s.current_status_name }}</div>
             {% endif %}
             {% if show_request and s.meeting.type_id == 'ietf' %}
                 {% if can_edit %}
@@ -28,9 +29,6 @@
         <td>
             {% if s.name %}{{ s.name }}{% endif %}
         </td>
-        <td>
-            {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %}
-        </td>
         <td>
             {% if show_ical and s.current_status == "sched" %}
                 {% if s.meeting.type_id == 'ietf' %}
@@ -78,5 +76,4 @@
             {% endif %}
         </td>
     </tr>
-    {% 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 %}
-        <h2 class="mt-3" id="inprogressmeets">Meetings in progress</h2>
+        <h2 class="mt-5" id="inprogressmeets">Meetings in progress</h2>
         {% with sessions=in_progress show_request=True show_ical=True can_edit_materials=can_edit %}
             <table class="table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="meeting">Meeting</th>
-                        <th scope="col" data-sort="date">Date</th>
-                        <th scope="col"></th>
+                        <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                        <th class="col-3" scope="col" data-sort="date">Date</th>
                         <th scope="col"></th>
                         <th scope="col">Materials</th>
                     </tr>
@@ -39,7 +38,7 @@ <h2 class="mt-3" id="inprogressmeets">Meetings in progress</h2>
         {% endwith %}
     {% endif %}
     {% if future %}
-        <h2 class="mt-3" id="futuremeets">
+        <h2 class="mt-5" id="futuremeets">
             Future Meetings
             <a class="float-end"
                aria-label="icalendar entry for all scheduled future {{ group.acronym }} meetings"
@@ -51,9 +50,8 @@ <h2 class="mt-3" id="futuremeets">
         <table class="table table-sm table-striped tablesorter">
             <thead>
                 <tr>
-                    <th scope="col" data-sort="meeting">Meeting</th>
-                    <th scope="col" data-sort="date">Date</th>
-                    <th scope="col"></th>
+                    <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                    <th class="col-3" scope="col" data-sort="date">Date</th>
                     <th scope="col"></th>
                     <th scope="col">Materials</th>
                 </tr>
@@ -66,13 +64,12 @@ <h2 class="mt-3" id="futuremeets">
         </table>
     {% endif %}
     {% if past or recent %}
-        <h2 class="mt-3" id="pastmeets">Past Meetings (within the last four years)</h2>
+        <h2 class="mt-5" id="pastmeets">Past Meetings (within the last four years)</h2>
         <table class="table table-sm table-striped tablesorter">
             <thead>
                 <tr>
-                    <th scope="col" data-sort="meeting">Meeting</th>
-                    <th scope="col" data-sort="date">Date</th>
-                    <th scope="col"></th>
+                    <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                    <th class="col-3" scope="col" data-sort="date">Date</th>
                     <th scope="col"></th>
                     <th scope="col">Materials</th>
                 </tr>
@@ -100,13 +97,12 @@ <h2 class="mt-3" id="pastmeets">Past Meetings (within the last four years)</h2>
             older_sessions value, this block will need to be adjusted.
         {% endcomment %}
         {% if far_past %}
-            <h2 class="mt-3" id="farpastmeets">Meetings more than four years ago</h2>
+            <h2 class="mt-5" id="farpastmeets">Meetings more than four years ago</h2>
             <table class="table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="meeting">Meeting</th>
-                        <th scope="col" data-sort="date">Date</th>
-                        <th scope="col"></th>
+                        <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                        <th class="col-3" scope="col" data-sort="date">Date</th>
                         <th scope="col"></th>
                         <th scope="col">Materials</th>
                     </tr>
@@ -160,3 +156,16 @@ <h2 class="mt-3" id="farpastmeets">Meetings more than four years ago</h2>
         {% endif %}
     {% endif %}
 {% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/list.js' %}"></script>
+    <script src="{% static 'ietf/js/moment.js' %}"></script>
+    <script src="{% static 'ietf/js/upcoming.js' %}"></script>
+    <script src="{% static 'ietf/js/timezone.js' %}"></script>
+    <script>
+    $(function () {
+            // Init with best guess at local timezone.
+            ietf_timezone.set_tz_change_callback(timezone_changed);
+            ietf_timezone.initialize('local');
+    });
+    </script>
+{% endblock %}
\ No newline at end of file

From b328baa90e9f0d99add554544a68c96fa88a8a34 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 11 Oct 2023 20:11:44 +0300
Subject: [PATCH 6/8] More suggestions from @rjsparks

---
 ietf/static/js/upcoming.js                        |  4 ++--
 ietf/templates/meeting/session_details.html       | 11 +++++++++++
 ietf/templates/meeting/session_details_panel.html |  4 ++--
 ietf/templates/meeting/tz-display.html            |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ietf/static/js/upcoming.js b/ietf/static/js/upcoming.js
index 4d7a82cc034..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)
@@ -142,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/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 @@ <h2 class="mt-3">
     {% endif %}
 {% endblock %}
 {% block js %}
+    <script src="{% static 'ietf/js/list.js' %}"></script>
+    <script src="{% static 'ietf/js/moment.js' %}"></script>
+    <script src="{% static 'ietf/js/upcoming.js' %}"></script>
+    <script src="{% static 'ietf/js/timezone.js' %}"></script>
+    <script>
+    $(function () {
+            // Init with best guess at local timezone.
+            ietf_timezone.set_tz_change_callback(timezone_changed);
+            ietf_timezone.initialize('local');
+    });
+    </script>
     {% if can_manage_materials %}
         <script src="{% static 'ietf/js/sortable.js' %}"></script>
         <script>
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 434608ad6cf..744c0e9ffc8 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -17,8 +17,8 @@ <h3 class="" id="session_{{ session.pk }}">
                 {% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %}
                 {% for time in session.times %}
                     {% if not forloop.first %},{% endif %}
-                    {{ time|timezone:session.meeting.time_zone|dateformat:"l Y-m-d H:i T" }}
-                    {% if time.tzinfo.zone != "UTC" %}<span class="small">({{ time|utc|dateformat:"H:i T" }})</span>{% endif %}
+                    <span class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
+                    {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix="" minimal=True only %}
                 {% endfor %}
                 {% if session.cancelled %}
                     <small class="badge rounded-pill text-bg-warning">Cancelled</small>
diff --git a/ietf/templates/meeting/tz-display.html b/ietf/templates/meeting/tz-display.html
index 16bc35ef389..54302bbe63d 100644
--- a/ietf/templates/meeting/tz-display.html
+++ b/ietf/templates/meeting/tz-display.html
@@ -13,7 +13,7 @@
 {% origin %}
 {% firstof id_suffix "" as suffix %}
 <div class="tz-display flex-fill {% if minimal %}btn-group btn-group-sm my-2{% else %}input-group my-3{% endif %} flex-wrap">
-    {% if not minimal %}<label class="input-group-text border-primary bg-white fw-bold">Time zone:</label>{% endif %}
+    {% if not minimal %}<label class="input-group-text border-primary bg-transparent fw-bold">Time zone:</label>{% endif %}
     {% if meeting_timezone is not None %}
         <input type="radio"
                name="tzradio{{ suffix }}"

From f3adafe472a86ef12a0bd1393237e1eb6f3fcaf0 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 11 Oct 2023 20:52:06 +0300
Subject: [PATCH 7/8] Fix HTML

---
 ietf/templates/meeting/tz-display.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/templates/meeting/tz-display.html b/ietf/templates/meeting/tz-display.html
index 54302bbe63d..2d11c6633ce 100644
--- a/ietf/templates/meeting/tz-display.html
+++ b/ietf/templates/meeting/tz-display.html
@@ -12,7 +12,7 @@
 {% load origin %}
 {% origin %}
 {% firstof id_suffix "" as suffix %}
-<div class="tz-display flex-fill {% if minimal %}btn-group btn-group-sm my-2{% else %}input-group my-3{% endif %} flex-wrap">
+<span class="tz-display flex-fill {% if minimal %}btn-group btn-group-sm my-2{% else %}input-group my-3{% endif %} flex-wrap">
     {% if not minimal %}<label class="input-group-text border-primary bg-transparent fw-bold">Time zone:</label>{% endif %}
     {% if meeting_timezone is not None %}
         <input type="radio"
@@ -46,4 +46,4 @@
             </option>
         </select>
     {% endif %}
-</div>
\ No newline at end of file
+</span>
\ No newline at end of file

From fa769f728a7aa2efb9ef013da1fb6449a8fec301 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 12 Oct 2023 07:34:20 +0300
Subject: [PATCH 8/8] Add suffix

---
 ietf/templates/meeting/session_details_panel.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 744c0e9ffc8..3ff09fc33ba 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -18,7 +18,7 @@ <h3 class="" id="session_{{ session.pk }}">
                 {% for time in session.times %}
                     {% if not forloop.first %},{% endif %}
                     <span class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
-                    {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix="" minimal=True only %}
+                    {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix=session.pk minimal=True only %}
                 {% endfor %}
                 {% if session.cancelled %}
                     <small class="badge rounded-pill text-bg-warning">Cancelled</small>