From e6f6799902fa37a76ff75dbaa5149cc7bacce7e3 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 5 May 2020 12:54:58 +0000
Subject: [PATCH] Added calendar icon links for webcal subscription and ical
 download to the Upcoming meetings page.  Removed the display of agenda and
 call-in links for cancelled meetings.  Moved the CANCELLED label into the
 freed-up space.  Commit ready to merge.  - Legacy-Id: 17735

---
 ietf/templates/meeting/upcoming.html | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index 192c9ff09..d2a6a523b 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -20,7 +20,14 @@
   <div class="row">
     <div class="col-md-10">
 
-      <h1>Upcoming Meetings</h1>
+      <h1>Upcoming Meetings
+         <span class="regular pull-right">
+         <a title="iCalendar subscription for upcoming meetings" href="webcal://{{request.get_host}}{% url 'ietf.meeting.views.upcoming_ical' %}">
+            <span class="fa fa-stack-1"><i class="fa fa-fw fa-calendar-o fa-stack-1x"></i><i class="fa fa-fw fa-repeat fa-stack-xs"></i></span>
+         </a>
+         <a title="iCalendar entry for upcoming meetings" href="{% url 'ietf.meeting.views.upcoming_ical' %}"><span class="fa fa-calendar"></span></a>
+         </span>
+      </h1>
 
       <p>For more on regular IETF meetings see <a href="https://www.ietf.org/meeting/upcoming.html">here</a></p>
 
@@ -68,11 +75,17 @@
                       <td>{{ session.official_timeslotassignment.timeslot.utc_start_time | date:"Y-m-d H:i"}} - {{ session.official_timeslotassignment.timeslot.utc_end_time | date:"H:i e" }}</td>
                       <td><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a></td>
                       <td>
-                        <a href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}">{{ session.meeting.number }}{% if session.current_status == 'canceled' %}&nbsp;&nbsp;<span class="label label-warning">CANCELLED</span>{% endif %}</a>
-                      </td>
-                      <td class='text-right'>
-                         {% include "meeting/interim_session_buttons.html" %}
+                        <a href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}">{{ session.meeting.number }}</a>
                       </td>
+                      {% if session.current_status == 'canceled' %}
+                        <td class='text-right'>
+                          <span class="label label-warning">CANCELLED</span>
+                        </td>
+                      {% else %}
+                        <td class='text-right'>
+                          {% include "meeting/interim_session_buttons.html" with show_agenda=True %}
+                        </td>
+                      {% endif %}
                     {% endwith %}
                   {% else %}
                       <td><span class="label-warning">Unexpected entry type: {{entry|classname}}</span></td>