From 47e33a39f4ce0cd27c98313a4607bf0e96d79ff4 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 3 Apr 2020 13:36:36 +0000
Subject: [PATCH] Added 'Remote instructions' at the top of interim sesssion
 pages, and made the 'Meeting Details' button available to the group chairs,
 not only secretariat.  - Legacy-Id: 17586

---
 ietf/meeting/views.py                         |  2 ++
 .../meeting/session_details_panel.html        | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 9433a81ec..51a124523 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -1159,6 +1159,7 @@ def session_details(request, num, acronym):
     # we somewhat arbitrarily use the group of the last session we get from
     # get_sessions() above when checking can_manage_session_materials()
     can_manage = can_manage_session_materials(request.user, session.group, session)
+    can_view_request = can_view_interim_request(meeting, request.user)
 
     scheduled_sessions = [s for s in sessions if s.current_status == 'sched']
     unscheduled_sessions = [s for s in sessions if s.current_status != 'sched']
@@ -1178,6 +1179,7 @@ def session_details(request, num, acronym):
                     'acronym' :acronym,
                     'is_materials_manager' : session.group.has_role(request.user, session.group.features.matman_roles),
                     'can_manage_materials' : can_manage,
+                    'can_view_request': can_view_request,
                     'thisweek': datetime.date.today()-datetime.timedelta(days=7),
                   })
 
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index bf93703ab..35f2822a2 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -1,4 +1,4 @@
-{% load origin ietf_filters %}{% origin %}
+{% load origin ietf_filters textfilters %}{% origin %}
 
   {% for session in sessions %}
     <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}
@@ -11,7 +11,7 @@
     {% if can_manage_materials %}
       {% if session.current_status == 'sched' or session.current_status == 'schedw' %}
         <div class="buttonlist">
-          {% if meeting.type_id == 'interim' and user|has_role:"Secretariat" %}
+          {% if can_view_request %}
             <a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">Meeting Details</a>
           {% endif %}
         </div>
@@ -21,6 +21,24 @@
       {% endif %}
     {% endif %}
 
+    {% if meeting.type.slug == 'interim' and session.remote_instructions %}
+    <div>
+       <b>Remote instructions:</b>
+       {% if "https://ietf.webex.com" in session.agenda_note|first_url %}
+         <a class=""
+           href="{{ session.agenda_note|first_url }}"
+           title="Webex session"><span class="fa fa-fw fa-phone"></span>
+         </a>
+       {% elif "https://ietf.webex.com" in session.remote_instructions|first_url %}
+         <a class=""
+           href="{{ session.remote_instructions|first_url }}"
+           title="Webex session"><span class="fa fa-fw fa-phone"></span>
+         </a>
+       {% endif %}
+       {{ session.remote_instructions }}
+    </div>
+    {% endif %}
+
     <div class="panel panel-default">
       <div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
       <div class="panel-body">