Skip to content

Commit

Permalink
Show bluesheets on the meetings materials page. Fixes #2633. Commit r…
Browse files Browse the repository at this point in the history 
…eady for merge.

 - Legacy-Id: 16154
  • Loading branch information
@rjsparks
rjsparks committed Apr 22, 2019
1 parent 88f49ed commit 7587570
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 12 deletions.
15 changes: 15 additions & 0 deletions ietf/templates/meeting/group_materials.html
View file
Expand Up @@ -58,6 +58,21 @@
{% endif %}
{% endif %}
</td>
<td>
{% if session.all_meeting_bluesheets %}
{% if session.all_meeting_bluesheets|length == 1 %}
<a href="{{ session.all_meeting_bluesheets.0|meeting_href:session.meeting }}">Bluesheets</a><br>
{% else %}
{% for bluesheets in session.all_meeting_bluesheets %}
<a href="{{ bluesheets|meeting_href:session.meeting}}">Bluesheets {{bluesheets.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
{% endfor %}
{% endif %}
{% else %}
{% if show_agenda == "True" %}
<span class="label label-warning">No bluesheets</span>
{% endif %}
{% endif %}
</td>
<td>
{% with session.all_meeting_slides as slides %}
{% for slide in slides %}
Expand Down
36 changes: 24 additions & 12 deletions ietf/templates/meeting/materials.html
View file
Expand Up @@ -48,15 +48,17 @@ <h2 class="anchor-target" id="plenaries">Plenaries</h2>
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-3">Drafts</th>
<th class="col-md-1">Updated</th>
<th class="col-md-1">&nbsp;</th>
{% else %}
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-4">Slides</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-1">Updated</th>
{% endif %}
Expand All @@ -82,15 +84,17 @@ <h2 class="anchor-target" id="{{sessions.list.0.group.parent.acronym}}">{{sessio
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-3">Drafts</th>
<th class="col-md-1">Updated</th>
<th class="col-md-1">&nbsp;</th>
{% else %}
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-4">Slides</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-1">Updated</th>
{% endif %}
Expand Down Expand Up @@ -118,15 +122,17 @@ <h2 class="anchor-target" id="training">Training</h2>
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-3">Drafts</th>
<th class="col-md-1">Updated</th>
<th class="col-md-1">&nbsp;</th>
{% else %}
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-4">Slides</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-1">Updated</th>
{% endif %}
Expand Down Expand Up @@ -154,15 +160,17 @@ <h2 class="anchor-target" id="iab">IAB <small>Internet Architecture Board</small
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-3">Drafts</th>
<th class="col-md-1">Updated</th>
<th class="col-md-1">&nbsp;</th>
{% else %}
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-4">Slides</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-1">Updated</th>
{% endif %}
Expand All @@ -189,15 +197,17 @@ <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</sm
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-3">Drafts</th>
<th class="col-md-1">Updated</th>
<th class="col-md-1">&nbsp;</th>
{% else %}
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-4">Slides</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-1">Updated</th>
{% endif %}
Expand All @@ -223,15 +233,17 @@ <h2 class="anchor-target" id="other">Other <small>Miscellaneous other sessions</
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-3">Drafts</th>
<th class="col-md-1">Updated</th>
<th class="col-md-1">&nbsp;</th>
{% else %}
<th class="col-md-1">Group</th>
<th class="col-md-1">Agenda</th>
<th class="col-md-1">Minutes</th>
<th class="col-md-4">Slides</th>
<th class="col-md-1">Bluesheets</th>
<th class="col-md-3">Slides</th>
<th class="col-md-4">Drafts</th>
<th class="col-md-1">Updated</th>
{% endif %}
Expand Down

0 comments on commit 7587570

Please sign in to comment.