Add missing template. Remove unused templates. Comit ready for merge.

- Legacy-Id: 15791
This commit is contained in:
Ryan Cross 2018-11-29 18:21:40 +00:00
parent e634dc2488
commit 4322bdaa6a
3 changed files with 51 additions and 160 deletions

View file

@ -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 %}

View file

@ -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 %}

View file

@ -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 %}