Skip to content

Commit 487c35d

Browse files
rjsparksrjsparks
committed
Whitespace only change to make the conditional structure followable. Commit ready for merge.
 - Legacy-Id: 15818
1 parent 590e20c commit 487c35d

1 file changed

Lines changed: 89 additions & 82 deletions

File tree

‎ietf/templates/meeting/session_buttons_include.html‎

Lines changed: 89 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,87 +3,94 @@
33
{% load staticfiles %}
44
{% load textfilters %}
55

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-
<a class="btn btn-default btn-xs"
21-
href="xmpp:{{item.session.jabber_room_name}}@jabber.ietf.org?join"
22-
title="Jabber room for {{item.session.jabber_room_name}}"><span class="fa fa-lightbulb-o"></span>
23-
</a>
6+
{% origin %}
247

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

0 commit comments

Comments
 (0)