Factored out some parts of the meeting/agenda.html into separate files, and added session buttons for 'other' session (e.g., hotrfc)
- Legacy-Id: 15710
This commit is contained in:
Henrik Levkowetz
parent
a99ca1584a
commit
df2747b963
|
|
@ -227,14 +227,21 @@
|
|||
<span class="label label-danger pull-right">CANCELLED</span>
|
||||
{% endif %}
|
||||
|
||||
{% if item.session.agenda %}
|
||||
{% include "meeting/session_agenda_include.html" %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="col-md-2">
|
||||
<span class="hidden-xs">
|
||||
{% if item.timeslot.type.slug == 'other' and not item.session.agenda %}
|
||||
{% for slide in item.session.slides %}
|
||||
<a href="{{slide.href}}">{{ slide.title|clean_whitespace }}</a>
|
||||
<br>
|
||||
{% endfor %}
|
||||
{% if item.timeslot.type.slug == 'other' %}
|
||||
{% if item.session.agenda %}
|
||||
{% include "meeting/session_buttons_include.html" %}
|
||||
{% else %}
|
||||
{% for slide in item.session.slides %}
|
||||
<a href="{{slide.href}}">{{ slide.title|clean_whitespace }}</a>
|
||||
<br>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</span>
|
||||
</td>
|
||||
|
|
@ -317,142 +324,12 @@
|
|||
<br><span class="text-danger">{{item.session.agenda_note}}</span>
|
||||
{% endif %}
|
||||
|
||||
<div class="modal fade" id="modal-{{ item.slug }}" tabindex="-1" role="dialog" aria-labelledby="label-{{ item.slug }}" aria-hidden="true">
|
||||
<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-{{item.slug}}">
|
||||
Meeting materials for
|
||||
{% if item.timeslot.type.slug == 'plenary' %}{{item.timeslot.name}}{% else %}{{item.session.historic_group.name}}{% endif %}
|
||||
{% include "meeting/session_agenda_include.html" %}
|
||||
|
||||
</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
{% with item.session.agenda as agenda %}
|
||||
{% if agenda %}
|
||||
{% if agenda.file_extension == "txt" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
|
||||
<h4>Agenda</h4>
|
||||
<div class="frame" data-src="{{agenda.href}}"></div>
|
||||
{% else %}
|
||||
<span class="label label-info">Agenda submitted as {{agenda.file_extension|upper}}</span>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<span class="label label-warning">No agenda submitted</span>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
{% if item.session.slides %}
|
||||
<h4>Slides</h4>
|
||||
<ul class="fa-ul list-unstyled">
|
||||
{% for slide in item.session.slides %}
|
||||
<li>
|
||||
<span class="fa-li fa fa-file-{{slide.file_extension|lower}}-o"></span>
|
||||
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-nowrap text-right">
|
||||
<span class="hidden-xs">
|
||||
{% if item.session.agenda %}
|
||||
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#modal-{{item.slug}}" title="Show meeting materials"><span class="fa fa-arrows-alt"></span></button>
|
||||
<a class="btn btn-default btn-xs" href="/meeting/{{schedule.meeting.number}}/agenda/{{item.session.historic_group.acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="fa fa-file-archive-o"></span></a>
|
||||
<a class="btn btn-default btn-xs" href="/meeting/{{ schedule.meeting.number }}/agenda/{{item.session.historic_group.acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-file-pdf-o"></span></a>
|
||||
{% endif %}
|
||||
{% if item.timeslot.type.slug == 'plenary' %}
|
||||
<a class="btn btn-default btn-xs" href="http://etherpad.tools.ietf.org/p/notes-ietf-{{ schedule.meeting.number }}-plenary?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-edit"></span></a>
|
||||
{% else %}
|
||||
<a class="btn btn-default btn-xs" href="http://etherpad.tools.ietf.org/p/notes-ietf-{{ schedule.meeting.number }}-{{item.session.historic_group.acronym}}?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-edit"></span></a>
|
||||
{% endif %}
|
||||
{# show stream buttons up till end of session, then show archive buttons #}
|
||||
{% if now < item.timeslot.end_time %}
|
||||
<!-- Jabber -->
|
||||
{% if item.timeslot.type.slug == 'plenary' %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="xmpp:plenary@jabber.ietf.org?join"
|
||||
title="Jabber room for {{item.timeslot.name}}"><span class="fa fa-lightbulb-o"></span>
|
||||
</a>
|
||||
{% else %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="xmpp:{{item.session.historic_group.acronym}}@jabber.ietf.org?join"
|
||||
title="Jabber room for {{item.session.historic_group.acronym}}"><span class="fa fa-lightbulb-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
<!-- Video stream (meetecho) -->
|
||||
{% if item.timeslot.location.video_stream_url %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="{{ item.timeslot.location.video_stream_url|format:item.session }}"
|
||||
title="Meetecho video stream"><span class="fa fa-video-camera"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
<!-- Audio stream -->
|
||||
{% if item.timeslot.location.audio_stream_url %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="{{item.timeslot.location.audio_stream_url|format:item.session }}"
|
||||
title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<!-- Jabber logs -->
|
||||
{% if schedule.meeting.number|add:"0" >= 60 %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="https://www.ietf.org/jabber/logs/{{item.session.historic_group.acronym}}"
|
||||
title="Jabber logs for {{item.session.historic_group.acronym}}">
|
||||
<span class="fa fa-stack">
|
||||
<i class="fa fa-file-o fa-stack-1x"></i>
|
||||
<i class="fa fa-lightbulb-o fa-stack-1x"></i>
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
<!-- Video recording -->
|
||||
{% if schedule.meeting.number|add:"0" >= 80 %}
|
||||
{% with item.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.href and 'audio' in r.href %}
|
||||
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title}}">
|
||||
<span class="fa fa-file-audio-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Then the youtube recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.href and 'youtu' in r.href %}
|
||||
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
|
||||
<span class="fa fa-file-video-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Finally, any other recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.href and not 'audio' in r.href and not 'youtu' in r.href %}
|
||||
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
|
||||
<span class="fa fa-file-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="http://www.meetecho.com/ietf{{schedule.meeting.number}}/recordings#{{item.session.historic_group.acronym.upper}}"
|
||||
title="Meetecho session recording"><img src="{% static 'ietf/images/meetecho-icon.svg' %}" alt="Meetecho Stream" width="12px">
|
||||
</a>
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
<!-- Audio recording -->
|
||||
{# <a class="btn btn-default btn-xs" href="" title="Audio recording"><span class="fa fa-file-audio-o"></span></a>#}
|
||||
{% endif %}
|
||||
{% include "meeting/session_buttons_include.html" %}
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
50
ietf/templates/meeting/session_agenda_include.html
Normal file
50
ietf/templates/meeting/session_agenda_include.html
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{# Copyright The IETF Trust 2015, All Rights Reserved #}
|
||||
{% load origin %}
|
||||
{% load staticfiles %}
|
||||
{% load textfilters %}
|
||||
{% load ietf_filters %}
|
||||
|
||||
|
||||
<div class="modal fade" id="modal-{{ item.slug }}" tabindex="-1" role="dialog" aria-labelledby="label-{{ item.slug }}" aria-hidden="true">
|
||||
<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-{{item.slug}}">
|
||||
Meeting materials for
|
||||
{% if item.timeslot.type.slug == 'plenary' %}{{item.timeslot.name}}{% else %}{{item.session.historic_group.name}}{% endif %}
|
||||
|
||||
</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
{% with item.session.agenda as agenda %}
|
||||
{% if agenda %}
|
||||
{% if agenda.file_extension == "txt" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
|
||||
<h4>Agenda</h4>
|
||||
<div class="frame" data-src="{{agenda.href}}"></div>
|
||||
{% else %}
|
||||
<span class="label label-info">Agenda submitted as {{agenda.file_extension|upper}}</span>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<span class="label label-warning">No agenda submitted</span>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
{% if item.session.slides %}
|
||||
<h4>Slides</h4>
|
||||
<ul class="fa-ul list-unstyled">
|
||||
{% for slide in item.session.slides %}
|
||||
<li>
|
||||
<span class="fa-li fa fa-file-{{slide.file_extension|lower}}-o"></span>
|
||||
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
96
ietf/templates/meeting/session_buttons_include.html
Normal file
96
ietf/templates/meeting/session_buttons_include.html
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
{# Copyright The IETF Trust 2015, All Rights Reserved #}
|
||||
{% load origin %}
|
||||
{% load staticfiles %}
|
||||
{% load textfilters %}
|
||||
|
||||
{% origin %}
|
||||
{% if item.session.agenda %}
|
||||
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#modal-{{item.slug}}" title="Show meeting materials"><span class="fa fa-arrows-alt"></span></button>
|
||||
<a class="btn btn-default btn-xs" href="/meeting/{{schedule.meeting.number}}/agenda/{{item.session.historic_group.acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="fa fa-file-archive-o"></span></a>
|
||||
<a class="btn btn-default btn-xs" href="/meeting/{{ schedule.meeting.number }}/agenda/{{item.session.historic_group.acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-file-pdf-o"></span></a>
|
||||
{% endif %}
|
||||
{% if item.timeslot.type.slug == 'plenary' %}
|
||||
<a class="btn btn-default btn-xs" href="http://etherpad.tools.ietf.org/p/notes-ietf-{{ schedule.meeting.number }}-plenary?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-edit"></span></a>
|
||||
{% else %}
|
||||
<a class="btn btn-default btn-xs" href="http://etherpad.tools.ietf.org/p/notes-ietf-{{ schedule.meeting.number }}-{{item.session.historic_group.acronym}}?useMonospaceFont=true" title="Etherpad for note-takers"><span class="fa fa-edit"></span></a>
|
||||
{% endif %}
|
||||
{# show stream buttons up till end of session, then show archive buttons #}
|
||||
{% if now < item.timeslot.end_time %}
|
||||
<!-- Jabber -->
|
||||
{% if item.timeslot.type.slug == 'plenary' %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="xmpp:plenary@jabber.ietf.org?join"
|
||||
title="Jabber room for {{item.timeslot.name}}"><span class="fa fa-lightbulb-o"></span>
|
||||
</a>
|
||||
{% else %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="xmpp:{{item.session.historic_group.acronym}}@jabber.ietf.org?join"
|
||||
title="Jabber room for {{item.session.historic_group.acronym}}"><span class="fa fa-lightbulb-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
<!-- Video stream (meetecho) -->
|
||||
{% if item.timeslot.location.video_stream_url %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="{{ item.timeslot.location.video_stream_url|format:item.session }}"
|
||||
title="Meetecho video stream"><span class="fa fa-video-camera"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
<!-- Audio stream -->
|
||||
{% if item.timeslot.location.audio_stream_url %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="{{item.timeslot.location.audio_stream_url|format:item.session }}"
|
||||
title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<!-- Jabber logs -->
|
||||
{% if schedule.meeting.number|add:"0" >= 60 %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="https://www.ietf.org/jabber/logs/{{item.session.historic_group.acronym}}"
|
||||
title="Jabber logs for {{item.session.historic_group.acronym}}">
|
||||
<span class="fa fa-stack">
|
||||
<i class="fa fa-file-o fa-stack-1x"></i>
|
||||
<i class="fa fa-lightbulb-o fa-stack-1x"></i>
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
<!-- Video recording -->
|
||||
{% if schedule.meeting.number|add:"0" >= 80 %}
|
||||
{% with item.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.href and 'audio' in r.href %}
|
||||
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title}}">
|
||||
<span class="fa fa-file-audio-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Then the youtube recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.href and 'youtu' in r.href %}
|
||||
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
|
||||
<span class="fa fa-file-video-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<!-- Finally, any other recordings -->
|
||||
{% for r in recordings %}
|
||||
{% if r.href and not 'audio' in r.href and not 'youtu' in r.href %}
|
||||
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
|
||||
<span class="fa fa-file-o"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
<a class="btn btn-default btn-xs"
|
||||
href="http://www.meetecho.com/ietf{{schedule.meeting.number}}/recordings#{{item.session.historic_group.acronym.upper}}"
|
||||
title="Meetecho session recording"><img src="{% static 'ietf/images/meetecho-icon.svg' %}" alt="Meetecho Stream" width="12px">
|
||||
</a>
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
<!-- Audio recording -->
|
||||
{# <a class="btn btn-default btn-xs" href="" title="Audio recording"><span class="fa fa-file-audio-o"></span></a>#}
|
||||
{% endif %}
|
||||
Loading…
Reference in a new issue