More agenda fixes.
- Legacy-Id: 19662
This commit is contained in:
Lars Eggert
parent
75b5fc158e
commit
2a8c231fd4
|
|
@ -102,7 +102,7 @@
|
|||
|
||||
{% ifchanged item.timeslot.time|date:"Y-m-d" %}
|
||||
<tr class="table-warning">
|
||||
<th colspan="7">
|
||||
<th colspan="5">
|
||||
{# The anchor here needs to be in a div, not in the th, in order for the anchor-target margin hack to work #}
|
||||
<div class="anchor-target" id="{{item.timeslot.time|slugify}}"></div>
|
||||
<h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
|
||||
|
|
@ -114,7 +114,6 @@
|
|||
<tr id="row-{{ item.slug }}" data-filter-keywords="{{ item.filter_keywords|join:',' }}"
|
||||
data-slot-start-ts="{{item.start_timestamp}}"
|
||||
data-slot-end-ts="{{item.end_timestamp}}">
|
||||
<td class="leftmarker"></td>
|
||||
<td class="text-nowrap text-right">
|
||||
<div class="hidden-xs">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
|
|
@ -160,7 +159,6 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="rightmarker"></td>
|
||||
</tr>
|
||||
|
||||
{% elif item|is_regular_agenda_item or item|is_plenary_agenda_item %}
|
||||
|
|
@ -170,7 +168,6 @@
|
|||
<tr class="info session-label-row"
|
||||
data-slot-start-ts="{{item.start_timestamp}}"
|
||||
data-slot-end-ts="{{item.end_timestamp}}">
|
||||
<td class="leftmarker"></td>
|
||||
<th class="text-nowrap text-right">
|
||||
<div class="hidden-xs">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
|
|
@ -183,7 +180,6 @@
|
|||
{{ item.timeslot.time|date:"l"}}
|
||||
{{item.timeslot.name|capfirst_allcaps}}
|
||||
</th>
|
||||
<td class="rightmarker"></td>
|
||||
</tr>
|
||||
{% endifchanged %}
|
||||
{% endif %}
|
||||
|
|
@ -194,7 +190,6 @@
|
|||
data-filter-keywords="{{ item.filter_keywords|join:',' }}"
|
||||
data-slot-start-ts="{{item.start_timestamp}}"
|
||||
data-slot-end-ts="{{item.end_timestamp}}">
|
||||
<td class="leftmarker"></td>
|
||||
{% if item.slot_type.slug == 'plenary' %}
|
||||
<th class="text-nowrap text-right">
|
||||
<div class="hidden-xs">
|
||||
|
|
@ -246,7 +241,7 @@
|
|||
{% if item.session.current_status == 'canceled' %}
|
||||
<span class="badge bg-danger float-end">CANCELLED</span>
|
||||
{% else %}
|
||||
<div class="float-end padded-left">
|
||||
<div class="float-end ps-3">
|
||||
{% include "meeting/session_buttons_include.html" with show_agenda=True session=item.session meeting=schedule.meeting %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
@ -277,7 +272,6 @@
|
|||
<br><span class="text-danger">{{item.session.agenda_note}}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="rightmarker"></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title" id="label-{{slug}}">
|
||||
Meeting materials for
|
||||
{% if timeslot.type.slug == 'plenary' %}{{timeslot.name}}{% else %}{{session.historic_group.name}}{% endif %}
|
||||
</h4>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="session-materials"
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
|
||||
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -6,104 +6,107 @@
|
|||
{% origin %}
|
||||
|
||||
{% if item|should_show_agenda_session_buttons %}
|
||||
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %}
|
||||
<div id="session-buttons-{{session.pk}}" class="text-nowrap">
|
||||
{% with acronym=session.historic_group.acronym %}
|
||||
{% if session.agenda and show_agenda %}
|
||||
{# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
|
||||
{% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %}
|
||||
<!-- agenda pop-up button -->
|
||||
<a class="" data-toggle="modal" data-target="#modal-{{slug}}" title="Show meeting materials"><span class="bi bi-arrows-fullscreen"></span></a>
|
||||
<!-- materials tar file -->
|
||||
<a class="" href="/meeting/{{meeting.number}}/agenda/{{acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="bi bi-file-zip"></span></a>
|
||||
<!-- materials PDF file -->
|
||||
<a class="" href="/meeting/{{ meeting.number }}/agenda/{{acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="bi bi-file-pdf"></span></a>
|
||||
{% endif %}
|
||||
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %}
|
||||
{% if session.agenda and show_agenda %}
|
||||
{# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
|
||||
{% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %}
|
||||
{% endif %}
|
||||
|
||||
<!-- HedgeDoc -->
|
||||
{% if use_codimd %}
|
||||
{% if timeslot.type.slug == 'plenary' %}
|
||||
<a class="" href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-plenary" title="Notepad for note-takers"><span class="bi bi-journal-text"></span></a>
|
||||
{% else %}
|
||||
<a class="" href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-{{acronym}}" title="Notepad for note-takers"><span class="bi bi-journal-text"></span></a>
|
||||
<div id="session-buttons-{{session.pk}}" role="group" class="btn-group btn-group-sm">
|
||||
{% with acronym=session.historic_group.acronym %}
|
||||
{% if session.agenda and show_agenda %}
|
||||
<!-- agenda pop-up button -->
|
||||
<a class="btn btn-outline-primary" role="button" data-bs-toggle="modal" data-bs-target="#modal-{{slug}}" title="Show meeting materials"><span class="bi bi-arrows-fullscreen"></span></a>
|
||||
<!-- materials tar file -->
|
||||
<a class="btn btn-outline-primary" role="button" href="/meeting/{{meeting.number}}/agenda/{{acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="bi bi-file-zip"></span></a>
|
||||
<!-- materials PDF file -->
|
||||
<a class="btn btn-outline-primary" role="button" href="/meeting/{{ meeting.number }}/agenda/{{acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="bi bi-file-pdf"></span></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{# show stream buttons up till end of session, then show archive buttons #}
|
||||
{% if now < timeslot.utc_end_time %}
|
||||
<!-- Jabber -->
|
||||
<a class=""
|
||||
href="xmpp:{{session.jabber_room_name}}@jabber.ietf.org?join"
|
||||
title="Chat room for {{session.jabber_room_name}}"><span class="bi bi-lightbulb"></span></a>
|
||||
<!-- Video stream (meetecho) -->
|
||||
{% if timeslot.location.video_stream_url %}
|
||||
<a class=""
|
||||
href="{{timeslot.location.video_stream_url|format:session }}"
|
||||
title="Video stream"><span class="bi bi-camera-video"></span></a>
|
||||
{% endif %}
|
||||
<!-- Audio stream -->
|
||||
{% if timeslot.location.audio_stream_url %}
|
||||
<a class=""
|
||||
href="{{timeslot.location.audio_stream_url|format:session }}"
|
||||
title="Audio stream"><span class="bi bi-headphones"></span></a>
|
||||
{% endif %}
|
||||
<!-- Remote call-in -->
|
||||
{% if session.agenda_note|first_url|conference_url %}
|
||||
<a class=""
|
||||
href="{{ session.agenda_note|first_url }}"
|
||||
title="Online conference"><span class="bi bi-people"></span></a>
|
||||
{% elif session.remote_instructions|first_url|conference_url %}
|
||||
<a class=""
|
||||
href="{{ session.remote_instructions|first_url }}"
|
||||
title="Online conference"><span class="bi bi-people"></span></a>
|
||||
{% elif timeslot.location.webex_url %}
|
||||
<a class=""
|
||||
href="{{timeslot.location.webex_url|format:session }}"
|
||||
title="Webex session"><span class="bi bi-people"></span></a>
|
||||
{% endif %}
|
||||
<!-- iCalendar item -->
|
||||
<a
|
||||
href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
|
||||
title="icalendar entry for {{acronym}} session on {{timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC">
|
||||
<span class="bi bi-calendar"></span></a>
|
||||
{% else %}
|
||||
<!-- Jabber logs -->
|
||||
{% if meeting.number|add:"0" >= 60 %}
|
||||
<a class="" href="https://www.ietf.org/jabber/logs/{{session.jabber_room_name}}?C=M;O=D" title="Chat logs for {{session.jabber_room_name}}"><i class="bi bi-file-text"></i></a>
|
||||
{% endif %}
|
||||
<!-- Recordings -->
|
||||
{% if meeting.number|add:"0" >= 80 %}
|
||||
{% with session.recordings as recordings %}
|
||||
{% if recordings %}
|
||||
{# There's no guaranteed order, so this is a bit messy: #}
|
||||
<!-- First, the audio recordings, if any -->
|
||||
{% for r in recordings %}
|
||||
{% if r.get_href and 'audio' in r.get_href %}
|
||||
<a class="" href="{{ r.get_href }}" title="{{ r.title}}"><span class="bi bi-file-play"></span></a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Then the youtube recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.get_href and 'youtu' in r.get_href %}
|
||||
<a class="" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-slides"></span></a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Finally, any other recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
|
||||
<a class="" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-play"></span></a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
{% if timeslot.location.video_stream_url %}
|
||||
<a class=""
|
||||
href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{acronym.upper}}"
|
||||
title="Session recording"><span class="bi bi-file-slides"></span></a>
|
||||
<!-- HedgeDoc -->
|
||||
{% if use_codimd %}
|
||||
{% if timeslot.type.slug == 'plenary' %}
|
||||
<a class="btn btn-outline-primary" role="button" href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-plenary" title="Notepad for note-takers"><span class="bi bi-journal-text"></span></a>
|
||||
{% else %}
|
||||
<a class="btn btn-outline-primary" role="button" href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-{{acronym}}" title="Notepad for note-takers"><span class="bi bi-journal-text"></span></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
</div>
|
||||
{% endwith %}{% endwith %}{% endwith %}{% endwith %}
|
||||
|
||||
{# show stream buttons up till end of session, then show archive buttons #}
|
||||
{% if now < timeslot.utc_end_time %}
|
||||
<!-- Jabber -->
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="xmpp:{{session.jabber_room_name}}@jabber.ietf.org?join"
|
||||
title="Chat room for {{session.jabber_room_name}}"><span class="bi bi-lightbulb"></span></a>
|
||||
<!-- Video stream (meetecho) -->
|
||||
{% if timeslot.location.video_stream_url %}
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="{{timeslot.location.video_stream_url|format:session }}"
|
||||
title="Video stream"><span class="bi bi-camera-video"></span></a>
|
||||
{% endif %}
|
||||
<!-- Audio stream -->
|
||||
{% if timeslot.location.audio_stream_url %}
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="{{timeslot.location.audio_stream_url|format:session }}"
|
||||
title="Audio stream"><span class="bi bi-headphones"></span></a>
|
||||
{% endif %}
|
||||
<!-- Remote call-in -->
|
||||
{% if session.agenda_note|first_url|conference_url %}
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="{{ session.agenda_note|first_url }}"
|
||||
title="Online conference"><span class="bi bi-people"></span></a>
|
||||
{% elif session.remote_instructions|first_url|conference_url %}
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="{{ session.remote_instructions|first_url }}"
|
||||
title="Online conference"><span class="bi bi-people"></span></a>
|
||||
{% elif timeslot.location.webex_url %}
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="{{timeslot.location.webex_url|format:session }}"
|
||||
title="Webex session"><span class="bi bi-people"></span></a>
|
||||
{% endif %}
|
||||
<!-- iCalendar item -->
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
|
||||
title="icalendar entry for {{acronym}} session on {{timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC">
|
||||
<span class="bi bi-calendar"></span></a>
|
||||
{% else %}
|
||||
<!-- Jabber logs -->
|
||||
{% if meeting.number|add:"0" >= 60 %}
|
||||
<a class="btn btn-outline-primary" role="button" href="https://www.ietf.org/jabber/logs/{{session.jabber_room_name}}?C=M;O=D" title="Chat logs for {{session.jabber_room_name}}"><i class="bi bi-file-text"></i></a>
|
||||
{% endif %}
|
||||
<!-- Recordings -->
|
||||
{% if meeting.number|add:"0" >= 80 %}
|
||||
{% with session.recordings as recordings %}
|
||||
{% if recordings %}
|
||||
{# There's no guaranteed order, so this is a bit messy: #}
|
||||
<!-- First, the audio recordings, if any -->
|
||||
{% for r in recordings %}
|
||||
{% if r.get_href and 'audio' in r.get_href %}
|
||||
<a class="btn btn-outline-primary" role="button" href="{{ r.get_href }}" title="{{ r.title}}"><span class="bi bi-file-play"></span></a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Then the youtube recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.get_href and 'youtu' in r.get_href %}
|
||||
<a class="btn btn-outline-primary" role="button" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-slides"></span></a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Finally, any other recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
|
||||
<a class="btn btn-outline-primary" role="button" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-play"></span></a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
{% if timeslot.location.video_stream_url %}
|
||||
<a class="btn btn-outline-primary" role="button"
|
||||
href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{acronym.upper}}"
|
||||
title="Session recording"><span class="bi bi-file-slides"></span></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
</div>
|
||||
{% endwith %}{% endwith %}{% endwith %}{% endwith %}
|
||||
{% endif %}
|
||||
Loading…
Reference in a new issue