-
+
{{ session.group.acronym }}
{% if session.purpose_id != "regular" and session.purpose_id != "none" %}
diff --git a/ietf/secr/templates/sreq/session_approval_notification.txt b/ietf/templates/meeting/session_approval_notification.txt
similarity index 56%
rename from ietf/secr/templates/sreq/session_approval_notification.txt
rename to ietf/templates/meeting/session_approval_notification.txt
index 7bb63aa3fa..74eca09bd8 100644
--- a/ietf/secr/templates/sreq/session_approval_notification.txt
+++ b/ietf/templates/meeting/session_approval_notification.txt
@@ -1,3 +1,4 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
Dear {{ group.parent }} Director(s):
{{ header }} meeting session request has just been
@@ -5,11 +6,11 @@ submitted by {{ requester }}.
The third session requires your approval.
To approve the session go to the session request view here:
-{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.secr.sreq.views.view" acronym=group.acronym %}
+{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.meeting.views_session_request.view_request" acronym=group.acronym %}
and click "Approve Third Session".
Regards,
The IETF Secretariat.
-{% include "includes/session_info.txt" %}
+{% include "meeting/session_request_info.txt" %}
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index bb5144b45d..b1fd92ba5b 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -2,7 +2,8 @@
{% load origin %}
{% load static %}
{% load textfilters tz %}
-{% load ietf_filters %}
+{% load ietf_filters session_filters %}
+
{% origin %}
{% if item and item|should_show_agenda_session_buttons %}
{% with slug=item.slug session=item.session timeslot=item.timeslot %}
@@ -126,10 +127,10 @@
{% else %}
{# chat logs #}
- {% if meeting.has_chat_logs %}
+ {% if meeting.has_chat_logs and session.chatlog %}
@@ -303,10 +304,10 @@
{% else %}
{# chat logs #}
- {% if meeting.has_chat_logs %}
+ {% if meeting.has_chat_logs and session.chatlog %}
+ href="/doc/{{ session.chatlog.document.name }}">
Chat logs
diff --git a/ietf/secr/templates/sreq/session_cancel_notification.txt b/ietf/templates/meeting/session_cancel_notification.txt
similarity index 71%
rename from ietf/secr/templates/sreq/session_cancel_notification.txt
rename to ietf/templates/meeting/session_cancel_notification.txt
index 8aee6c89db..3de67fc8f4 100644
--- a/ietf/secr/templates/sreq/session_cancel_notification.txt
+++ b/ietf/templates/meeting/session_cancel_notification.txt
@@ -1,3 +1,4 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
{% autoescape off %}{% load ams_filters %}
A request to cancel a meeting session has just been submitted by {{ requester }}.{% endautoescape %}
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 571715b4b4..a4d9ba1090 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2026, All Rights Reserved #}
{% load origin ietf_filters static %}
{% block title %}{{ meeting }} : {{ group.acronym }}{% endblock %}
{% block morecss %}
@@ -31,93 +31,58 @@ Scheduled Sessions
{% include 'meeting/session_details_panel.html' with sessions=scheduled_sessions %}
Unscheduled Sessions
{% include 'meeting/session_details_panel.html' with sessions=unscheduled_sessions %}
- {% if pending_suggestions %}
-
+ {% for s in pending_suggestions %}
+ {% if forloop.first %}
{% if can_manage_materials %}
Proposed slides awaiting your approval
{% else %}
Your proposed slides awaiting chair approval
{% endif %}
-
- {% for s in pending_suggestions %}
- {% if can_manage_materials %}
-
-
- {{ s.submitter }} - {{ s.title }} ({{ s.time }})
-
-
- {% else %}
-
- {{ s.title }} ({{ s.time }})
-
- {% endif %}
- {% endfor %}
+ {% endif %}
+ {% endfor %}
+ {% if user|has_role:"Secretariat" %}
+
{% endif %}
+ {% comment %}
+ The existence of an element with id canManageMaterialsFlag is checked in
+ session_details.js to determine whether it should init the sortable tables.
+ Not the most elegant approach, but it works.
+ {% endcomment %}
+ {% if can_manage_materials %} {% endif %}
{% endblock %}
{% block js %}
-
{% if can_manage_materials %}
-
{% endif %}
+
{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_details_form.html b/ietf/templates/meeting/session_details_form.html
index 6b59e7dacd..9cd1b6e85c 100644
--- a/ietf/templates/meeting/session_details_form.html
+++ b/ietf/templates/meeting/session_details_form.html
@@ -1,42 +1,48 @@
-{# Copyright The IETF Trust 2007-2020, All Rights Reserved #}
+{# Copyright The IETF Trust 2007-2025, All Rights Reserved #}
+{% load django_bootstrap5 %}
+
\ No newline at end of file
+ {{ form.attendees.as_hidden }}
+ {{ form.comments.as_hidden }}
+ {{ form.id.as_hidden }}
+ {{ form.on_agenda.as_hidden }}
+ {{ form.DELETE.as_hidden }}
+ {{ form.remote_instructions.as_hidden }}
+ {{ form.short.as_hidden }}
+ {{ form.agenda_note.as_hidden }}
+
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 9b7a192f05..7c52ac0b4a 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -109,7 +109,7 @@ Agenda, Minutes, and Bluesheets
{% endif %}
{% if not session.type_counter.minutes %}
- Import minutes from notes.ietf.org
+ Import minutes from notes.ietf.org
Upload minutes
@@ -310,7 +310,7 @@ Notes and recordings
|