Skip to content
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

Jump to bottom

fix: Add remote instructions and date/time to interim agenda page #6442

Merged
merged 11 commits into from
Oct 12, 2023
Merged

fix: Add remote instructions and date/time to interim agenda page #6442

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1af3ceb
fix: Add remote instructions to interim agenda page
larseggert Oct 6, 2023
88fe1a4
Also add date and time
larseggert Oct 6, 2023
0c3f1b7
Fix HTML
larseggert Oct 6, 2023
e032fa0
Fix CI fail
larseggert Oct 6, 2023
efe41fa
Merge branch 'main' into fix-6433
larseggert Oct 11, 2023
2866eea
Address code review comments
larseggert Oct 11, 2023
b328baa
More suggestions from @rjsparks
larseggert Oct 11, 2023
f3adafe
Fix HTML
larseggert Oct 11, 2023
45def86
Merge branch 'main' into fix-6433
larseggert Oct 11, 2023
fa769f7
Add suffix
larseggert Oct 12, 2023
1763d74
Merge branch 'fix-6433' of github.com:larseggert/datatracker into fix…
larseggert Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 33 additions & 2 deletions ietf/templates/doc/document_material.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -29,6 +29,23 @@
{% 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 %}
{% 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>
</tr>
{% endif %}
<tr>
<th scope="row">Title</th>
<td class="edit">
Expand Down Expand Up @@ -97,7 +114,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>
Expand Down