From 758757038a18bc29ba27b8c135b6a322cd0886fb Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Mon, 22 Apr 2019 20:44:21 +0000
Subject: [PATCH] Show bluesheets on the meetings materials page. Fixes #2633.
 Commit ready for merge.  - Legacy-Id: 16154

---
 ietf/templates/meeting/group_materials.html | 15 +++++++++
 ietf/templates/meeting/materials.html       | 36 ++++++++++++++-------
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html
index b57f98dd43..46b54157d7 100644
--- a/ietf/templates/meeting/group_materials.html
+++ b/ietf/templates/meeting/group_materials.html
@@ -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 %}
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index 4bee217745..b12e13d1fc 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}