Skip to content

Commit 2a8c231

Browse files
larseggertlarseggert
committed
More agenda fixes.
 - Legacy-Id: 19662
1 parent 75b5fc1 commit 2a8c231

3 files changed

Lines changed: 101 additions & 104 deletions

File tree

‎ietf/templates/meeting/agenda.html‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ <h2>Detailed Agenda</h2>
102102

103103
{% ifchanged item.timeslot.time|date:"Y-m-d" %}
104104
<tr class="table-warning">
105-
<th colspan="7">
105+
<th colspan="5">
106106
{# The anchor here needs to be in a div, not in the th, in order for the anchor-target margin hack to work #}
107107
<div class="anchor-target" id="{{item.timeslot.time|slugify}}"></div>
108108
<h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
@@ -114,7 +114,6 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
114114
<tr id="row-{{ item.slug }}" data-filter-keywords="{{ item.filter_keywords|join:',' }}"
115115
data-slot-start-ts="{{item.start_timestamp}}"
116116
data-slot-end-ts="{{item.end_timestamp}}">
117-
<td class="leftmarker"></td>
118117
<td class="text-nowrap text-right">
119118
<div class="hidden-xs">
120119
{% include "meeting/timeslot_start_end.html" %}
@@ -160,7 +159,6 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
160159
</div>
161160
{% endif %}
162161
</td>
163-
<td class="rightmarker"></td>
164162
</tr>
165163

166164
{% elif item|is_regular_agenda_item or item|is_plenary_agenda_item %}
@@ -170,7 +168,6 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
170168
<tr class="info session-label-row"
171169
data-slot-start-ts="{{item.start_timestamp}}"
172170
data-slot-end-ts="{{item.end_timestamp}}">
173-
<td class="leftmarker"></td>
174171
<th class="text-nowrap text-right">
175172
<div class="hidden-xs">
176173
{% include "meeting/timeslot_start_end.html" %}
@@ -183,7 +180,6 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
183180
{{ item.timeslot.time|date:"l"}}
184181
{{item.timeslot.name|capfirst_allcaps}}
185182
</th>
186-
<td class="rightmarker"></td>
187183
</tr>
188184
{% endifchanged %}
189185
{% endif %}
@@ -194,7 +190,6 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
194190
data-filter-keywords="{{ item.filter_keywords|join:',' }}"
195191
data-slot-start-ts="{{item.start_timestamp}}"
196192
data-slot-end-ts="{{item.end_timestamp}}">
197-
<td class="leftmarker"></td>
198193
{% if item.slot_type.slug == 'plenary' %}
199194
<th class="text-nowrap text-right">
200195
<div class="hidden-xs">
@@ -246,7 +241,7 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
246241
{% if item.session.current_status == 'canceled' %}
247242
<span class="badge bg-danger float-end">CANCELLED</span>
248243
{% else %}
249-
<div class="float-end padded-left">
244+
<div class="float-end ps-3">
250245
{% include "meeting/session_buttons_include.html" with show_agenda=True session=item.session meeting=schedule.meeting %}
251246
</div>
252247
{% endif %}
@@ -277,7 +272,6 @@ <h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
277272
<br><span class="text-danger">{{item.session.agenda_note}}</span>
278273
{% endif %}
279274
</td>
280-
<td class="rightmarker"></td>
281275
</tr>
282276
{% endif %}
283277
{% endif %}

‎ietf/templates/meeting/session_agenda_include.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
<div class="modal-dialog modal-lg">
99
<div class="modal-content">
1010
<div class="modal-header">
11-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
1211
<h4 class="modal-title" id="label-{{slug}}">
1312
Meeting materials for
1413
{% if timeslot.type.slug == 'plenary' %}{{timeslot.name}}{% else %}{{session.historic_group.name}}{% endif %}
1514
</h4>
15+
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
1616
</div>
1717
<div class="modal-body">
1818
<div class="session-materials"
1919
data-src="{% url 'ietf.meeting.views.session_materials' session_id=session.pk %}">
2020
</div>
2121
</div>
2222
<div class="modal-footer">
23-
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
23+
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
2424
</div>
2525
</div>
2626
</div>
27-
</div>
27+
</div>

‎ietf/templates/meeting/session_buttons_include.html‎

Lines changed: 96 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -6,104 +6,107 @@
66
{% origin %}
77

88
{% if item|should_show_agenda_session_buttons %}
9-
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %}
10-
<div id="session-buttons-{{session.pk}}" class="text-nowrap">
11-
{% with acronym=session.historic_group.acronym %}
12-
{% if session.agenda and show_agenda %}
13-
{# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
14-
{% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %}
15-
<!-- agenda pop-up button -->
16-
<a class="" data-toggle="modal" data-target="#modal-{{slug}}" title="Show meeting materials"><span class="bi bi-arrows-fullscreen"></span></a>
17-
<!-- materials tar file -->
18-
<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>
19-
<!-- materials PDF file -->
20-
<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>
21-
{% endif %}
9+
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %}
10+
{% if session.agenda and show_agenda %}
11+
{# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
12+
{% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %}
13+
{% endif %}
2214

23-
<!-- HedgeDoc -->
24-
{% if use_codimd %}
25-
{% if timeslot.type.slug == 'plenary' %}
26-
<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>
27-
{% else %}
28-
<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>
15+
<div id="session-buttons-{{session.pk}}" role="group" class="btn-group btn-group-sm">
16+
{% with acronym=session.historic_group.acronym %}
17+
{% if session.agenda and show_agenda %}
18+
<!-- agenda pop-up button -->
19+
<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>
20+
<!-- materials tar file -->
21+
<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>
22+
<!-- materials PDF file -->
23+
<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>
2924
{% endif %}
30-
{% endif %}
3125

32-
{# show stream buttons up till end of session, then show archive buttons #}
33-
{% if now < timeslot.utc_end_time %}
34-
<!-- Jabber -->
35-
<a class=""
36-
href="xmpp:{{session.jabber_room_name}}@jabber.ietf.org?join"
37-
title="Chat room for {{session.jabber_room_name}}"><span class="bi bi-lightbulb"></span></a>
38-
<!-- Video stream (meetecho) -->
39-
{% if timeslot.location.video_stream_url %}
40-
<a class=""
41-
href="{{timeslot.location.video_stream_url|format:session }}"
42-
title="Video stream"><span class="bi bi-camera-video"></span></a>
43-
{% endif %}
44-
<!-- Audio stream -->
45-
{% if timeslot.location.audio_stream_url %}
46-
<a class=""
47-
href="{{timeslot.location.audio_stream_url|format:session }}"
48-
title="Audio stream"><span class="bi bi-headphones"></span></a>
49-
{% endif %}
50-
<!-- Remote call-in -->
51-
{% if session.agenda_note|first_url|conference_url %}
52-
<a class=""
53-
href="{{ session.agenda_note|first_url }}"
54-
title="Online conference"><span class="bi bi-people"></span></a>
55-
{% elif session.remote_instructions|first_url|conference_url %}
56-
<a class=""
57-
href="{{ session.remote_instructions|first_url }}"
58-
title="Online conference"><span class="bi bi-people"></span></a>
59-
{% elif timeslot.location.webex_url %}
60-
<a class=""
61-
href="{{timeslot.location.webex_url|format:session }}"
62-
title="Webex session"><span class="bi bi-people"></span></a>
63-
{% endif %}
64-
<!-- iCalendar item -->
65-
<a
66-
href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
67-
title="icalendar entry for {{acronym}} session on {{timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC">
68-
<span class="bi bi-calendar"></span></a>
69-
{% else %}
70-
<!-- Jabber logs -->
71-
{% if meeting.number|add:"0" >= 60 %}
72-
<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>
26+
<!-- HedgeDoc -->
27+
{% if use_codimd %}
28+
{% if timeslot.type.slug == 'plenary' %}
29+
<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>
30+
{% else %}
31+
<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>
32+
{% endif %}
7333
{% endif %}
74-
<!-- Recordings -->
75-
{% if meeting.number|add:"0" >= 80 %}
76-
{% with session.recordings as recordings %}
77-
{% if recordings %}
78-
{# There's no guaranteed order, so this is a bit messy: #}
79-
<!-- First, the audio recordings, if any -->
80-
{% for r in recordings %}
81-
{% if r.get_href and 'audio' in r.get_href %}
82-
<a class="" href="{{ r.get_href }}" title="{{ r.title}}"><span class="bi bi-file-play"></span></a>
83-
{% endif %}
84-
{% endfor %}
85-
<!-- Then the youtube recordings -->
86-
{% for r in recordings %}
87-
{% if r.get_href and 'youtu' in r.get_href %}
88-
<a class="" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-slides"></span></a>
89-
{% endif %}
90-
{% endfor %}
91-
<!-- Finally, any other recordings -->
92-
{% for r in recordings %}
93-
{% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
94-
<a class="" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-play"></span></a>
95-
{% endif %}
96-
{% endfor %}
97-
{% endif %}
98-
{% endwith %}
34+
35+
{# show stream buttons up till end of session, then show archive buttons #}
36+
{% if now < timeslot.utc_end_time %}
37+
<!-- Jabber -->
38+
<a class="btn btn-outline-primary" role="button"
39+
href="xmpp:{{session.jabber_room_name}}@jabber.ietf.org?join"
40+
title="Chat room for {{session.jabber_room_name}}"><span class="bi bi-lightbulb"></span></a>
41+
<!-- Video stream (meetecho) -->
9942
{% if timeslot.location.video_stream_url %}
100-
<a class=""
101-
href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{acronym.upper}}"
102-
title="Session recording"><span class="bi bi-file-slides"></span></a>
43+
<a class="btn btn-outline-primary" role="button"
44+
href="{{timeslot.location.video_stream_url|format:session }}"
45+
title="Video stream"><span class="bi bi-camera-video"></span></a>
46+
{% endif %}
47+
<!-- Audio stream -->
48+
{% if timeslot.location.audio_stream_url %}
49+
<a class="btn btn-outline-primary" role="button"
50+
href="{{timeslot.location.audio_stream_url|format:session }}"
51+
title="Audio stream"><span class="bi bi-headphones"></span></a>
52+
{% endif %}
53+
<!-- Remote call-in -->
54+
{% if session.agenda_note|first_url|conference_url %}
55+
<a class="btn btn-outline-primary" role="button"
56+
href="{{ session.agenda_note|first_url }}"
57+
title="Online conference"><span class="bi bi-people"></span></a>
58+
{% elif session.remote_instructions|first_url|conference_url %}
59+
<a class="btn btn-outline-primary" role="button"
60+
href="{{ session.remote_instructions|first_url }}"
61+
title="Online conference"><span class="bi bi-people"></span></a>
62+
{% elif timeslot.location.webex_url %}
63+
<a class="btn btn-outline-primary" role="button"
64+
href="{{timeslot.location.webex_url|format:session }}"
65+
title="Webex session"><span class="bi bi-people"></span></a>
66+
{% endif %}
67+
<!-- iCalendar item -->
68+
<a class="btn btn-outline-primary" role="button"
69+
href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
70+
title="icalendar entry for {{acronym}} session on {{timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC">
71+
<span class="bi bi-calendar"></span></a>
72+
{% else %}
73+
<!-- Jabber logs -->
74+
{% if meeting.number|add:"0" >= 60 %}
75+
<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>
76+
{% endif %}
77+
<!-- Recordings -->
78+
{% if meeting.number|add:"0" >= 80 %}
79+
{% with session.recordings as recordings %}
80+
{% if recordings %}
81+
{# There's no guaranteed order, so this is a bit messy: #}
82+
<!-- First, the audio recordings, if any -->
83+
{% for r in recordings %}
84+
{% if r.get_href and 'audio' in r.get_href %}
85+
<a class="btn btn-outline-primary" role="button" href="{{ r.get_href }}" title="{{ r.title}}"><span class="bi bi-file-play"></span></a>
86+
{% endif %}
87+
{% endfor %}
88+
<!-- Then the youtube recordings -->
89+
{% for r in recordings %}
90+
{% if r.get_href and 'youtu' in r.get_href %}
91+
<a class="btn btn-outline-primary" role="button" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-slides"></span></a>
92+
{% endif %}
93+
{% endfor %}
94+
<!-- Finally, any other recordings -->
95+
{% for r in recordings %}
96+
{% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
97+
<a class="btn btn-outline-primary" role="button" href="{{ r.get_href }}" title="{{ r.title }}"><span class="bi bi-file-play"></span></a>
98+
{% endif %}
99+
{% endfor %}
100+
{% endif %}
101+
{% endwith %}
102+
{% if timeslot.location.video_stream_url %}
103+
<a class="btn btn-outline-primary" role="button"
104+
href="http://www.meetecho.com/ietf{{meeting.number}}/recordings#{{acronym.upper}}"
105+
title="Session recording"><span class="bi bi-file-slides"></span></a>
106+
{% endif %}
103107
{% endif %}
104108
{% endif %}
105-
{% endif %}
106-
{% endwith %}
107-
</div>
108-
{% endwith %}{% endwith %}{% endwith %}{% endwith %}
109+
{% endwith %}
110+
</div>
111+
{% endwith %}{% endwith %}{% endwith %}{% endwith %}
109112
{% endif %}

0 commit comments

Comments
 (0)