5598762608
* Update vnu.jar * Fix py2 -> py3 issue * Run pyupgrade * test: Add default-jdk to images * test: Add option to also validate HTML with vnu.jar Since it's already installed in bin. Don't do this by default, since it increases the time needed for tests by ~50%. * fix: Stop the urlizer from urlizing in linkified mailto: text * More HTML fixes * More HTML validation fixes * And more HTML fixes * Fix floating badge * Ignore unicode errors * Only URLize docs that are existing * Final fixes * Don't URLize everything during test-crawl * Feed HTML into vnu using python rather than Java to speed things up * Allow test-crawl to start vnu on a different port * Increase retry count to vnu. Restore batch size to 30. * More HTML validation fixes * Use urllib3 to make requests to vnu, since overriding requests_mock is tricky * Undo commit of unmodified file * Also urlize ftp links * Fix matching of file name * More HTML fixes * Add `is_valid_url` filter * weekday -> data-weekday * urlencode URLs * Add and use vnu_fmt_message. Bump vnu max buffer. * Simplify doc_exists * Don't add tab link to mail archive if the URL is invalid * Run urlize_ietf_docs before linkify Reduces the possibility of generating incorrect HTML * Undo superfluous change * Runner fixes * Consolidate vnu message filtering into vnu_filter_message * Correctly handle multiple persons with same name * Minimze diff * Fix HTML nits * Print source snippet in vnu_fmt_message * Only escape if there is something to escape * Fix snippet * Skip crufty old IPR declarations * Only include modal when needed. Add handles. * Fix wordwrap+linkification * Update ietf/doc/templatetags/ietf_filters.py * Update ietf/doc/templatetags/tests_ietf_filters.py * Don't right-align second column
197 lines
11 KiB
HTML
197 lines
11 KiB
HTML
{% load origin ietf_filters textfilters tz dateformat %}
|
|
{% origin %}
|
|
{% for session in sessions %}
|
|
{% with item=session.official_timeslotassignment %}
|
|
<h3 class="mt-4" id="session_{{ session.pk }}">
|
|
{% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %}
|
|
{% for time in session.times %}
|
|
{% if not forloop.first %},{% endif %}
|
|
{{ time|dateformat:"l Y-m-d H:i T" }}
|
|
{% if time.tzinfo.zone != "UTC" %}<span class="small">({{ time|utc|dateformat:"H:i T" }})</span>{% endif %}
|
|
{% endfor %}
|
|
{% if session.cancelled %}
|
|
<small class="badge bg-warning">Cancelled</small>
|
|
{% else %}
|
|
{{ session.status }}
|
|
{% endif %}
|
|
{% if session.name %}: {{ session.name }}{% endif %}
|
|
</h3>
|
|
{% if not session.cancelled %}
|
|
<div class="regular float-end">
|
|
{# see note in the included templates re: show_agenda parameter and required JS import #}
|
|
{% if meeting.type.slug == 'interim' %}
|
|
{% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
|
|
{% else %}
|
|
{% with schedule=meeting.schedule %}
|
|
{% include "meeting/session_buttons_include.html" with show_agenda=False %}
|
|
{% endwith %}
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
{% if session.agenda_note %}<h3 class="mt-4">{{ session.agenda_note }}</h3>{% endif %}
|
|
{% if can_manage_materials %}
|
|
{% if session.current_status == 'sched' or session.current_status == 'schedw' %}
|
|
<div class="buttonlist">
|
|
{% if can_view_request %}
|
|
<a class="btn btn-primary"
|
|
href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">
|
|
Meeting details
|
|
</a>
|
|
{% endif %}
|
|
</div>
|
|
{% if not session.type_counter.agenda %}
|
|
<div class="alert alert-warning my-3">This session does not yet have an agenda.</div>
|
|
{% endif %}
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if meeting.type.slug == 'interim' and session.remote_instructions %}
|
|
<div class="my-3">
|
|
<b>Remote instructions:</b>
|
|
{% if session.agenda_note|first_url|conference_url %}
|
|
<a href="{{ session.agenda_note|first_url }}" title="Online conference">
|
|
<i class="bi bi-beople"></i>
|
|
</a>
|
|
{% elif session.remote_instructions|first_url|conference_url %}
|
|
<a href="{{ session.remote_instructions|first_url }}"
|
|
title="Online conference">
|
|
<i class="bi bi-people"></i>
|
|
</a>
|
|
{% endif %}
|
|
{{ session.remote_instructions|linkify }}
|
|
</div>
|
|
{% endif %}
|
|
<h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
|
|
<table class="table table-sm table-striped">
|
|
{% if session.filtered_artifacts %}
|
|
<tbody>
|
|
{% for pres in session.filtered_artifacts %}
|
|
<tr>
|
|
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
|
|
<td>
|
|
<a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
|
|
<a href="{{ url }}">({{ pres.document.name }})</a>
|
|
</td>
|
|
<td class="text-end">
|
|
{% if user|has_role:"Secretariat" or can_manage_materials %}
|
|
{% if pres.document.type.slug == 'minutes' %}
|
|
{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
|
|
{% elif pres.document.type.slug == 'agenda' %}
|
|
{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
|
|
{% else %}
|
|
{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number as upload_url %}
|
|
{% endif %}
|
|
{% if pres.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
|
|
{% if pres.document.type.slug == 'minutes' %}
|
|
<a class="btn btn-primary btn-sm" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import from notes.ietf.org</a>
|
|
{% endif %}
|
|
<a class="btn btn-primary btn-sm" href="{{ upload_url }}">Upload revision</a>
|
|
{% endif %}
|
|
{% endif %}
|
|
</td>
|
|
</tr>
|
|
{% endfor %}
|
|
</tbody>
|
|
{% endif %}
|
|
</table>
|
|
{% if can_manage_materials %}
|
|
{% if not session.type_counter.agenda %}
|
|
<a class="btn btn-primary"
|
|
href="{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number %}">
|
|
Upload agenda
|
|
</a>
|
|
{% endif %}
|
|
{% if not session.type_counter.minutes %}
|
|
<a class="btn btn-primary" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import minutes from notes.ietf.org</a>
|
|
<a class="btn btn-primary"
|
|
href="{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number %}">
|
|
Upload minutes
|
|
</a>
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if user|has_role:"Secretariat" and not session.type_counter.bluesheets or meeting.type.slug == 'interim' and can_manage_materials and not session.type_counter.bluesheets %}
|
|
<a class="btn btn-primary"
|
|
href="{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number %}">
|
|
Upload bluesheets
|
|
</a>
|
|
{% endif %}
|
|
<h3 class="mt-4">Slides</h3>
|
|
<table class="table table-sm table-striped slides"
|
|
id="slides_{{ session.pk }}">
|
|
{% if session.filtered_slides %}
|
|
<tbody data-session="{{ session.pk }}"
|
|
data-add-to-session="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}"
|
|
data-remove-from-session="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}"
|
|
data-reorder-in-session="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
|
|
{% for pres in session.filtered_slides %}
|
|
<tr data-name="{{ pres.document.name }}" title="Drag to reorder.">
|
|
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
|
|
<td><i class="bi bi-grip-vertical"></i></td>
|
|
<td>
|
|
<a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
|
|
<a href="{{ url }}">({{ pres.document.name }})</a>
|
|
</td>
|
|
<td class="text-end">
|
|
{% if can_manage_materials %}
|
|
<a class="btn btn-primary btn-sm"
|
|
href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
|
|
Upload revision
|
|
</a>
|
|
<a class="btn btn-danger btn-sm"
|
|
href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
|
|
Remove
|
|
</a>
|
|
{% endif %}
|
|
</td>
|
|
</tr>
|
|
{% endfor %}
|
|
</tbody>
|
|
{% endif %}
|
|
</table>
|
|
{% if can_manage_materials %}
|
|
<a class="btn btn-primary uploadslides"
|
|
href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">
|
|
Upload new slides
|
|
</a>
|
|
{% elif request.user.is_authenticated and not session.is_material_submission_cutoff %}
|
|
<a class="btn btn-primary proposeslides"
|
|
href="{% url 'ietf.meeting.views.propose_session_slides' session_id=session.pk num=session.meeting.number %}">
|
|
Propose slides
|
|
</a>
|
|
{% endif %}
|
|
|
|
{% if can_manage_materials %}<div class="form-text">Drag-and-drop to reorder slides</div>{% endif %}
|
|
<h3 class="mt-4">Drafts</h3>
|
|
<table class="table table-sm table-striped">
|
|
{% if session.filtered_drafts %}
|
|
<tbody>
|
|
{% for pres in session.filtered_drafts %}
|
|
<tr>
|
|
<td>
|
|
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
|
|
<a href="{{ url }}">
|
|
{{ pres.document.title }} ({{ pres.document.name }})
|
|
{% if pres.rev %}Version {{ pres.rev }}{% endif %}
|
|
</a>
|
|
</td>
|
|
<td>
|
|
{% if can_manage_materials %}
|
|
<a class="btn btn-primary btn-sm"
|
|
href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
|
|
Remove
|
|
</a>
|
|
{% endif %}
|
|
</td>
|
|
</tr>
|
|
{% endfor %}
|
|
</tbody>
|
|
{% endif %}
|
|
</table>
|
|
{% if can_manage_materials %}
|
|
<a class="btn btn-primary"
|
|
href="{% url 'ietf.meeting.views.add_session_drafts' session_id=session.pk num=session.meeting.number %}">
|
|
Link additional drafts to session
|
|
</a>
|
|
{% endif %}
|
|
{% endwith %}
|
|
{% endfor %}
|