From 4322bdaa6afd7275fc3d5d7a94598a06b12b40a1 Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Thu, 29 Nov 2018 18:21:40 +0000
Subject: [PATCH] Add missing template. Remove unused templates. Comit ready
 for merge.  - Legacy-Id: 15791

---
 ietf/secr/templates/meetings/schedule.html | 108 ---------------------
 ietf/secr/templates/meetings/select.html   |  52 ----------
 ietf/secr/templates/meetings/sessions.html |  51 ++++++++++
 3 files changed, 51 insertions(+), 160 deletions(-)
 delete mode 100644 ietf/secr/templates/meetings/schedule.html
 delete mode 100644 ietf/secr/templates/meetings/select.html
 create mode 100644 ietf/secr/templates/meetings/sessions.html

diff --git a/ietf/secr/templates/meetings/schedule.html b/ietf/secr/templates/meetings/schedule.html
deleted file mode 100644
index 6005291d9..000000000
--- a/ietf/secr/templates/meetings/schedule.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Meetings{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-  <script type="text/javascript" src="{% static 'secr/js/utils.js' %}"></script>
-  
-   <script type="text/javascript">
-    $(document).ready(function() {
-      $.ajaxSetup ({  
-        cache: false  
-      });
-      
-      $("select[id$='day']").change(function(){
-          var loadUrl = "/secr/meetings/ajax/get-times/";
-          var url = window.location.pathname;
-          var parts = url.split("/");
-          var id = this.id;
-          var new_id = id.replace('day','time');
-          var sel = "#"+new_id;
-          var day = $(this).val();
-          loadUrl = loadUrl+parts[3]+"/"+day+"/";
-          $.getJSON(loadUrl,function(data) {
-            $(sel+" option").remove();
-            $.each(data,function(i,item) {
-              $(sel).append('<option value="'+item.id+'">'+item.value+'</option>');
-            });
-          });
-      });
-      
-    
-    });
-    
-  </script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-  &raquo; <a href="{% url "ietf.secr.meetings.views.main" %}">Meetings</a>
-  &raquo; <a href="{% url "ietf.secr.meetings.views.view" meeting_id=meeting.number %}">{{ meeting.number }}</a>
-  &raquo; <a href="{% url "ietf.secr.meetings.views.select" meeting_id=meeting.number schedule_name=schedule.name %}">{{ schedule.name }}</a>
-  &raquo; <a href="{% url "ietf.secr.meetings.views.select_group" meeting_id=meeting.number schedule_name=schedule.name %}">Select</a>
-  &raquo; {{ group.acronym }}
-{% endblock %}
-
-{% block content %}
-
-<div class="module">
-    <h2>Requested Information</h2>
-    
-    {% if show_request %}
-       {% include "includes/sessions_request_view.html" %}
-    {% endif %}
-    
-    <div class="inline-group">
-    <h2>Sessions</h2>
-
-        <form id="meetings-schedule-form" method="post" action="">{% csrf_token %}
-        {{ formset.management_form }}
-          {% for form in formset.forms %}
-            <div class="inline-related{% if forloop.last %} last-related{% endif %}">
-              <h3><b>Session:</b>&nbsp; #{{ forloop.counter }}{% if form.session_object.status.slug == 'apprw' %}<span class="message-right">Waiting for Approval</span>{% endif %}</h3>
-              <table class="full-width amstable">
-                <col width="200">
-                {{ form }}
-              </table>
-            </div> <!-- inline-related -->
-          {% endfor %}
-    </div> <!-- inline-group -->
-    
-      <div class="button-group">
-       <ul>
-         <li><button type="submit" name="submit" value="Save">Save</button></li>
-         <li><button type="button" onclick="if (window.confirm('This group will be permanently removed from the agenda and scheduling tool')) { window.location='{% url "ietf.secr.meetings.views.remove_session" meeting_id=meeting.number acronym=group.acronym %}' };">Remove this group from agenda</button></li>
-         <li><button type="button" onclick="window.location='{% url "ietf.secr.meetings.views.select_group" meeting_id=meeting.number schedule_name=schedule.name %}'">Back</button></li>
-        </ul>
-      </div> <!-- button-group -->
-      
-      </form>
-      
-</div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-  {% include "includes/meetings_footer.html" %}
-{% endblock %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ietf/secr/templates/meetings/select.html b/ietf/secr/templates/meetings/select.html
deleted file mode 100644
index 06a11171b..000000000
--- a/ietf/secr/templates/meetings/select.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Meetings{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-  <script type="text/javascript" src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-  &raquo; <a href="../../">Meetings</a>
-  &raquo; <a href="../">{{ meeting.number }}</a>
-  &raquo; {{ schedule.name }}
-{% endblock %}
-
-{% block content %}
-
-<div class="module">
-     <h2>IETF  {{ meeting.number }}</h2>
-    
-    <div class="button-group">
-       <ul>
-         <li><button onclick="window.location='{% url "ietf.secr.meetings.views.rooms" meeting_id=meeting.number schedule_name=schedule.name %}'">Rooms and Times</button></li>
-         <li><button onclick="window.location='{% url "ietf.secr.meetings.views.select_group" meeting_id=meeting.number schedule_name=schedule.name %}'">Edit Session</button></li>
-         <li><button type="button" onclick="window.location='../'">Back</button></li>
-       </ul>
-      </div> <!-- button-group -->
-      
-</div> <!-- module -->
-
-{% endblock %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ietf/secr/templates/meetings/sessions.html b/ietf/secr/templates/meetings/sessions.html
new file mode 100644
index 000000000..ecd57c8c9
--- /dev/null
+++ b/ietf/secr/templates/meetings/sessions.html
@@ -0,0 +1,51 @@
+{% extends "meetings/base_rooms_times.html" %}
+{% load bootstrap3 %}
+
+{% block subsection %}
+
+<div class="module role-container">
+  <h2>Sessions</h2>
+
+  <table class="table table-condensed table-striped ipr-table tablesorter">
+    <thead>
+      <tr>
+        <th>Group</th>
+        <th>Time</th>
+        <th>Room</th>
+        <th>Agenda Note</th>
+        <th>Status</th>
+        <th></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for session in sessions %}
+        <tr>
+          <td>{{ session.group.acronym }}</td>
+          <td>
+            {% if session.official_timeslotassignment %}
+              {{ session.official_timeslotassignment.timeslot.time|date:"l H:i"|default:"" }}
+            {% endif %}
+          </td>
+          <td>
+            {% if session.official_timeslotassignment %}
+              {{ session.official_timeslotassignment.timeslot.location }}
+            {% endif %}
+          </td>
+          <td>{{ session.agenda_note }}</td>
+          <td>{{ session.status }}</td>
+          <td><a href="{% url 'ietf.secr.meetings.views.session_edit' meeting_id=meeting.number schedule_name=schedule.name session_id=session.id %}">Edit</a></td>
+          <td>
+            <form method="post">
+              {% csrf_token %}
+              <input type="hidden" name="pk" value="{{ session.pk }}">
+              <input type="submit" name="cancel" value="Cancel">
+            </form>
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div> <!-- module -->
+
+{% endblock %}