Skip to content

Commit 7587570

Browse files
rjsparksrjsparks
committed
Show bluesheets on the meetings materials page. Fixes ietf-tools#2633. Commit ready for merge.
 - Legacy-Id: 16154
1 parent 88f49ed commit 7587570

2 files changed

Lines changed: 39 additions & 12 deletions

File tree

‎ietf/templates/meeting/group_materials.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,21 @@
5858
{% endif %}
5959
{% endif %}
6060
</td>
61+
<td>
62+
{% if session.all_meeting_bluesheets %}
63+
{% if session.all_meeting_bluesheets|length == 1 %}
64+
<a href="{{ session.all_meeting_bluesheets.0|meeting_href:session.meeting }}">Bluesheets</a><br>
65+
{% else %}
66+
{% for bluesheets in session.all_meeting_bluesheets %}
67+
<a href="{{ bluesheets|meeting_href:session.meeting}}">Bluesheets {{bluesheets.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
68+
{% endfor %}
69+
{% endif %}
70+
{% else %}
71+
{% if show_agenda == "True" %}
72+
<span class="label label-warning">No bluesheets</span>
73+
{% endif %}
74+
{% endif %}
75+
</td>
6176
<td>
6277
{% with session.all_meeting_slides as slides %}
6378
{% for slide in slides %}

‎ietf/templates/meeting/materials.html‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,17 @@ <h2 class="anchor-target" id="plenaries">Plenaries</h2>
4848
<th class="col-md-1">Group</th>
4949
<th class="col-md-1">Agenda</th>
5050
<th class="col-md-1">Minutes</th>
51+
<th class="col-md-1">Bluesheets</th>
5152
<th class="col-md-3">Slides</th>
52-
<th class="col-md-4">Drafts</th>
53+
<th class="col-md-3">Drafts</th>
5354
<th class="col-md-1">Updated</th>
5455
<th class="col-md-1">&nbsp;</th>
5556
{% else %}
5657
<th class="col-md-1">Group</th>
5758
<th class="col-md-1">Agenda</th>
5859
<th class="col-md-1">Minutes</th>
59-
<th class="col-md-4">Slides</th>
60+
<th class="col-md-1">Bluesheets</th>
61+
<th class="col-md-3">Slides</th>
6062
<th class="col-md-4">Drafts</th>
6163
<th class="col-md-1">Updated</th>
6264
{% endif %}
@@ -82,15 +84,17 @@ <h2 class="anchor-target" id="{{sessions.list.0.group.parent.acronym}}">{{sessio
8284
<th class="col-md-1">Group</th>
8385
<th class="col-md-1">Agenda</th>
8486
<th class="col-md-1">Minutes</th>
87+
<th class="col-md-1">Bluesheets</th>
8588
<th class="col-md-3">Slides</th>
86-
<th class="col-md-4">Drafts</th>
89+
<th class="col-md-3">Drafts</th>
8790
<th class="col-md-1">Updated</th>
8891
<th class="col-md-1">&nbsp;</th>
8992
{% else %}
9093
<th class="col-md-1">Group</th>
9194
<th class="col-md-1">Agenda</th>
9295
<th class="col-md-1">Minutes</th>
93-
<th class="col-md-4">Slides</th>
96+
<th class="col-md-1">Bluesheets</th>
97+
<th class="col-md-3">Slides</th>
9498
<th class="col-md-4">Drafts</th>
9599
<th class="col-md-1">Updated</th>
96100
{% endif %}
@@ -118,15 +122,17 @@ <h2 class="anchor-target" id="training">Training</h2>
118122
<th class="col-md-1">Group</th>
119123
<th class="col-md-1">Agenda</th>
120124
<th class="col-md-1">Minutes</th>
125+
<th class="col-md-1">Bluesheets</th>
121126
<th class="col-md-3">Slides</th>
122-
<th class="col-md-4">Drafts</th>
127+
<th class="col-md-3">Drafts</th>
123128
<th class="col-md-1">Updated</th>
124129
<th class="col-md-1">&nbsp;</th>
125130
{% else %}
126131
<th class="col-md-1">Group</th>
127132
<th class="col-md-1">Agenda</th>
128133
<th class="col-md-1">Minutes</th>
129-
<th class="col-md-4">Slides</th>
134+
<th class="col-md-1">Bluesheets</th>
135+
<th class="col-md-3">Slides</th>
130136
<th class="col-md-4">Drafts</th>
131137
<th class="col-md-1">Updated</th>
132138
{% endif %}
@@ -154,15 +160,17 @@ <h2 class="anchor-target" id="iab">IAB <small>Internet Architecture Board</small
154160
<th class="col-md-1">Group</th>
155161
<th class="col-md-1">Agenda</th>
156162
<th class="col-md-1">Minutes</th>
163+
<th class="col-md-1">Bluesheets</th>
157164
<th class="col-md-3">Slides</th>
158-
<th class="col-md-4">Drafts</th>
165+
<th class="col-md-3">Drafts</th>
159166
<th class="col-md-1">Updated</th>
160167
<th class="col-md-1">&nbsp;</th>
161168
{% else %}
162169
<th class="col-md-1">Group</th>
163170
<th class="col-md-1">Agenda</th>
164171
<th class="col-md-1">Minutes</th>
165-
<th class="col-md-4">Slides</th>
172+
<th class="col-md-1">Bluesheets</th>
173+
<th class="col-md-3">Slides</th>
166174
<th class="col-md-4">Drafts</th>
167175
<th class="col-md-1">Updated</th>
168176
{% endif %}
@@ -189,15 +197,17 @@ <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</sm
189197
<th class="col-md-1">Group</th>
190198
<th class="col-md-1">Agenda</th>
191199
<th class="col-md-1">Minutes</th>
200+
<th class="col-md-1">Bluesheets</th>
192201
<th class="col-md-3">Slides</th>
193-
<th class="col-md-4">Drafts</th>
202+
<th class="col-md-3">Drafts</th>
194203
<th class="col-md-1">Updated</th>
195204
<th class="col-md-1">&nbsp;</th>
196205
{% else %}
197206
<th class="col-md-1">Group</th>
198207
<th class="col-md-1">Agenda</th>
199208
<th class="col-md-1">Minutes</th>
200-
<th class="col-md-4">Slides</th>
209+
<th class="col-md-1">Bluesheets</th>
210+
<th class="col-md-3">Slides</th>
201211
<th class="col-md-4">Drafts</th>
202212
<th class="col-md-1">Updated</th>
203213
{% endif %}
@@ -223,15 +233,17 @@ <h2 class="anchor-target" id="other">Other <small>Miscellaneous other sessions</
223233
<th class="col-md-1">Group</th>
224234
<th class="col-md-1">Agenda</th>
225235
<th class="col-md-1">Minutes</th>
236+
<th class="col-md-1">Bluesheets</th>
226237
<th class="col-md-3">Slides</th>
227-
<th class="col-md-4">Drafts</th>
238+
<th class="col-md-3">Drafts</th>
228239
<th class="col-md-1">Updated</th>
229240
<th class="col-md-1">&nbsp;</th>
230241
{% else %}
231242
<th class="col-md-1">Group</th>
232243
<th class="col-md-1">Agenda</th>
233244
<th class="col-md-1">Minutes</th>
234-
<th class="col-md-4">Slides</th>
245+
<th class="col-md-1">Bluesheets</th>
246+
<th class="col-md-3">Slides</th>
235247
<th class="col-md-4">Drafts</th>
236248
<th class="col-md-1">Updated</th>
237249
{% endif %}

0 commit comments

Comments
 (0)