Skip to content

Commit df2747b

Browse files
levkowetzlevkowetz
committed
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
1 parent a99ca15 commit df2747b

3 files changed

Lines changed: 161 additions & 138 deletions

File tree

‎ietf/templates/meeting/agenda.html‎

Lines changed: 15 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,21 @@ <h2>
227227
<span class="label label-danger pull-right">CANCELLED</span>
228228
{% endif %}
229229

230+
{% if item.session.agenda %}
231+
{% include "meeting/session_agenda_include.html" %}
232+
{% endif %}
230233
</td>
231234
<td class="col-md-2">
232235
<span class="hidden-xs">
233-
{% if item.timeslot.type.slug == 'other' and not item.session.agenda %}
234-
{% for slide in item.session.slides %}
235-
<a href="{{slide.href}}">{{ slide.title|clean_whitespace }}</a>
236-
<br>
237-
{% endfor %}
236+
{% if item.timeslot.type.slug == 'other' %}
237+
{% if item.session.agenda %}
238+
{% include "meeting/session_buttons_include.html" %}
239+
{% else %}
240+
{% for slide in item.session.slides %}
241+
<a href="{{slide.href}}">{{ slide.title|clean_whitespace }}</a>
242+
<br>
243+
{% endfor %}
244+
{% endif %}
238245
{% endif %}
239246
</span>
240247
</td>
@@ -317,142 +324,12 @@ <h2>
317324
<br><span class="text-danger">{{item.session.agenda_note}}</span>
318325
{% endif %}
319326

320-
<div class="modal fade" id="modal-{{ item.slug }}" tabindex="-1" role="dialog" aria-labelledby="label-{{ item.slug }}" aria-hidden="true">
321-
<div class="modal-dialog modal-lg">
322-
<div class="modal-content">
323-
<div class="modal-header">
324-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
325-
<h4 class="modal-title" id="label-{{item.slug}}">
326-
Meeting materials for
327-
{% if item.timeslot.type.slug == 'plenary' %}{{item.timeslot.name}}{% else %}{{item.session.historic_group.name}}{% endif %}
328-
329-
</h4>
330-
</div>
331-
<div class="modal-body">
332-
{% with item.session.agenda as agenda %}
333-
{% if agenda %}
334-
{% if agenda.file_extension == "txt" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
335-
<h4>Agenda</h4>
336-
<div class="frame" data-src="{{agenda.href}}"></div>
337-
{% else %}
338-
<span class="label label-info">Agenda submitted as {{agenda.file_extension|upper}}</span>
339-
{% endif %}
340-
{% else %}
341-
<span class="label label-warning">No agenda submitted</span>
342-
{% endif %}
343-
{% endwith %}
344-
345-
{% if item.session.slides %}
346-
<h4>Slides</h4>
347-
<ul class="fa-ul list-unstyled">
348-
{% for slide in item.session.slides %}
349-
<li>
350-
<span class="fa-li fa fa-file-{{slide.file_extension|lower}}-o"></span>
351-
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
352-
</li>
353-
{% endfor %}
354-
</ul>
355-
{% endif %}
356-
</div>
357-
<div class="modal-footer">
358-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
359-
</div>
360-
</div>
361-
</div>
362-
</div>
327+
{% include "meeting/session_agenda_include.html" %}
328+
363329
</td>
364330
<td class="text-nowrap text-right">
365331
<span class="hidden-xs">
366-
{% if item.session.agenda %}
367-
<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>
368-
<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>
369-
<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>
370-
{% endif %}
371-
{% if item.timeslot.type.slug == 'plenary' %}
372-
<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>
373-
{% else %}
374-
<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>
375-
{% endif %}
376-
{# show stream buttons up till end of session, then show archive buttons #}
377-
{% if now < item.timeslot.end_time %}
378-
<!-- Jabber -->
379-
{% if item.timeslot.type.slug == 'plenary' %}
380-
<a class="btn btn-default btn-xs"
381-
href="xmpp:plenary@jabber.ietf.org?join"
382-
title="Jabber room for {{item.timeslot.name}}"><span class="fa fa-lightbulb-o"></span>
383-
</a>
384-
{% else %}
385-
<a class="btn btn-default btn-xs"
386-
href="xmpp:{{item.session.historic_group.acronym}}@jabber.ietf.org?join"
387-
title="Jabber room for {{item.session.historic_group.acronym}}"><span class="fa fa-lightbulb-o"></span>
388-
</a>
389-
{% endif %}
390-
391-
<!-- Video stream (meetecho) -->
392-
{% if item.timeslot.location.video_stream_url %}
393-
<a class="btn btn-default btn-xs"
394-
href="{{ item.timeslot.location.video_stream_url|format:item.session }}"
395-
title="Meetecho video stream"><span class="fa fa-video-camera"></span>
396-
</a>
397-
{% endif %}
398-
<!-- Audio stream -->
399-
{% if item.timeslot.location.audio_stream_url %}
400-
<a class="btn btn-default btn-xs"
401-
href="{{item.timeslot.location.audio_stream_url|format:item.session }}"
402-
title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
403-
</a>
404-
{% endif %}
405-
{% else %}
406-
<!-- Jabber logs -->
407-
{% if schedule.meeting.number|add:"0" >= 60 %}
408-
<a class="btn btn-default btn-xs"
409-
href="https://www.ietf.org/jabber/logs/{{item.session.historic_group.acronym}}"
410-
title="Jabber logs for {{item.session.historic_group.acronym}}">
411-
<span class="fa fa-stack">
412-
<i class="fa fa-file-o fa-stack-1x"></i>
413-
<i class="fa fa-lightbulb-o fa-stack-1x"></i>
414-
</span>
415-
</a>
416-
{% endif %}
417-
<!-- Video recording -->
418-
{% if schedule.meeting.number|add:"0" >= 80 %}
419-
{% with item.session.recordings as recordings %}
420-
{% if recordings %}
421-
<!-- There's no guaranteed order, so this is a bit messy: -->
422-
<!-- First, the audio recordings, if any -->
423-
{% for r in recordings %}
424-
{% if r.href and 'audio' in r.href %}
425-
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title}}">
426-
<span class="fa fa-file-audio-o"></span>
427-
</a>
428-
{% endif %}
429-
{% endfor %}
430-
<!-- Then the youtube recordings -->
431-
{% for r in recordings %}
432-
{% if r.href and 'youtu' in r.href %}
433-
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
434-
<span class="fa fa-file-video-o"></span>
435-
</a>
436-
{% endif %}
437-
{% endfor %}
438-
<!-- Finally, any other recordings -->
439-
{% for r in recordings %}
440-
{% if r.href and not 'audio' in r.href and not 'youtu' in r.href %}
441-
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
442-
<span class="fa fa-file-o"></span>
443-
</a>
444-
{% endif %}
445-
{% endfor %}
446-
{% endif %}
447-
<a class="btn btn-default btn-xs"
448-
href="http://www.meetecho.com/ietf{{schedule.meeting.number}}/recordings#{{item.session.historic_group.acronym.upper}}"
449-
title="Meetecho session recording"><img src="{% static 'ietf/images/meetecho-icon.svg' %}" alt="Meetecho Stream" width="12px">
450-
</a>
451-
{% endwith %}
452-
{% endif %}
453-
<!-- Audio recording -->
454-
{# <a class="btn btn-default btn-xs" href="" title="Audio recording"><span class="fa fa-file-audio-o"></span></a>#}
455-
{% endif %}
332+
{% include "meeting/session_buttons_include.html" %}
456333
</span>
457334
</td>
458335
</tr>

‎ietf/templates/meeting/session_agenda_include.html‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{# Copyright The IETF Trust 2015, All Rights Reserved #}
2+
{% load origin %}
3+
{% load staticfiles %}
4+
{% load textfilters %}
5+
{% load ietf_filters %}
6+
7+
8+
<div class="modal fade" id="modal-{{ item.slug }}" tabindex="-1" role="dialog" aria-labelledby="label-{{ item.slug }}" aria-hidden="true">
9+
<div class="modal-dialog modal-lg">
10+
<div class="modal-content">
11+
<div class="modal-header">
12+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
13+
<h4 class="modal-title" id="label-{{item.slug}}">
14+
Meeting materials for
15+
{% if item.timeslot.type.slug == 'plenary' %}{{item.timeslot.name}}{% else %}{{item.session.historic_group.name}}{% endif %}
16+
17+
</h4>
18+
</div>
19+
<div class="modal-body">
20+
{% with item.session.agenda as agenda %}
21+
{% if agenda %}
22+
{% if agenda.file_extension == "txt" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
23+
<h4>Agenda</h4>
24+
<div class="frame" data-src="{{agenda.href}}"></div>
25+
{% else %}
26+
<span class="label label-info">Agenda submitted as {{agenda.file_extension|upper}}</span>
27+
{% endif %}
28+
{% else %}
29+
<span class="label label-warning">No agenda submitted</span>
30+
{% endif %}
31+
{% endwith %}
32+
33+
{% if item.session.slides %}
34+
<h4>Slides</h4>
35+
<ul class="fa-ul list-unstyled">
36+
{% for slide in item.session.slides %}
37+
<li>
38+
<span class="fa-li fa fa-file-{{slide.file_extension|lower}}-o"></span>
39+
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
40+
</li>
41+
{% endfor %}
42+
</ul>
43+
{% endif %}
44+
</div>
45+
<div class="modal-footer">
46+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
47+
</div>
48+
</div>
49+
</div>
50+
</div>

‎ietf/templates/meeting/session_buttons_include.html‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{# Copyright The IETF Trust 2015, All Rights Reserved #}
2+
{% load origin %}
3+
{% load staticfiles %}
4+
{% load textfilters %}
5+
6+
{% origin %}
7+
{% if item.session.agenda %}
8+
<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>
9+
<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>
10+
<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>
11+
{% endif %}
12+
{% if item.timeslot.type.slug == 'plenary' %}
13+
<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>
14+
{% else %}
15+
<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>
16+
{% endif %}
17+
{# show stream buttons up till end of session, then show archive buttons #}
18+
{% if now < item.timeslot.end_time %}
19+
<!-- Jabber -->
20+
{% if item.timeslot.type.slug == 'plenary' %}
21+
<a class="btn btn-default btn-xs"
22+
href="xmpp:plenary@jabber.ietf.org?join"
23+
title="Jabber room for {{item.timeslot.name}}"><span class="fa fa-lightbulb-o"></span>
24+
</a>
25+
{% else %}
26+
<a class="btn btn-default btn-xs"
27+
href="xmpp:{{item.session.historic_group.acronym}}@jabber.ietf.org?join"
28+
title="Jabber room for {{item.session.historic_group.acronym}}"><span class="fa fa-lightbulb-o"></span>
29+
</a>
30+
{% endif %}
31+
32+
<!-- Video stream (meetecho) -->
33+
{% if item.timeslot.location.video_stream_url %}
34+
<a class="btn btn-default btn-xs"
35+
href="{{ item.timeslot.location.video_stream_url|format:item.session }}"
36+
title="Meetecho video stream"><span class="fa fa-video-camera"></span>
37+
</a>
38+
{% endif %}
39+
<!-- Audio stream -->
40+
{% if item.timeslot.location.audio_stream_url %}
41+
<a class="btn btn-default btn-xs"
42+
href="{{item.timeslot.location.audio_stream_url|format:item.session }}"
43+
title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
44+
</a>
45+
{% endif %}
46+
{% else %}
47+
<!-- Jabber logs -->
48+
{% if schedule.meeting.number|add:"0" >= 60 %}
49+
<a class="btn btn-default btn-xs"
50+
href="https://www.ietf.org/jabber/logs/{{item.session.historic_group.acronym}}"
51+
title="Jabber logs for {{item.session.historic_group.acronym}}">
52+
<span class="fa fa-stack">
53+
<i class="fa fa-file-o fa-stack-1x"></i>
54+
<i class="fa fa-lightbulb-o fa-stack-1x"></i>
55+
</span>
56+
</a>
57+
{% endif %}
58+
<!-- Video recording -->
59+
{% if schedule.meeting.number|add:"0" >= 80 %}
60+
{% with item.session.recordings as recordings %}
61+
{% if recordings %}
62+
<!-- There's no guaranteed order, so this is a bit messy: -->
63+
<!-- First, the audio recordings, if any -->
64+
{% for r in recordings %}
65+
{% if r.href and 'audio' in r.href %}
66+
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title}}">
67+
<span class="fa fa-file-audio-o"></span>
68+
</a>
69+
{% endif %}
70+
{% endfor %}
71+
<!-- Then the youtube recordings -->
72+
{% for r in recordings %}
73+
{% if r.href and 'youtu' in r.href %}
74+
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
75+
<span class="fa fa-file-video-o"></span>
76+
</a>
77+
{% endif %}
78+
{% endfor %}
79+
<!-- Finally, any other recordings -->
80+
{% for r in recordings %}
81+
{% if r.href and not 'audio' in r.href and not 'youtu' in r.href %}
82+
<a class="btn btn-default btn-xs" href="{{ r.href }}" title="{{ r.title }}">
83+
<span class="fa fa-file-o"></span>
84+
</a>
85+
{% endif %}
86+
{% endfor %}
87+
{% endif %}
88+
<a class="btn btn-default btn-xs"
89+
href="http://www.meetecho.com/ietf{{schedule.meeting.number}}/recordings#{{item.session.historic_group.acronym.upper}}"
90+
title="Meetecho session recording"><img src="{% static 'ietf/images/meetecho-icon.svg' %}" alt="Meetecho Stream" width="12px">
91+
</a>
92+
{% endwith %}
93+
{% endif %}
94+
<!-- Audio recording -->
95+
{# <a class="btn btn-default btn-xs" href="" title="Audio recording"><span class="fa fa-file-audio-o"></span></a>#}
96+
{% endif %}

0 commit comments

Comments
 (0)