Skip to content

Commit 88f49ed

Browse files
committed
Show minutes on the popup for the meeting materials button on the agenda page when those minutes are available. Fixes ietf-tools#2711. Commit ready for merge.
- Legacy-Id: 16152
1 parent d50adc0 commit 88f49ed

2 files changed

Lines changed: 27 additions & 0 deletions

File tree

ietf/templates/meeting/agenda.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,20 @@ <h2>
446446
$(i).html(data);
447447
});
448448
}
449+
var j = $(this).find(".frame2");
450+
if ($(j).data("src")) {
451+
$.get($(j).data("src"), function (data, status, xhr) {
452+
var t = xhr.getResponseHeader("content-type");
453+
if (t.indexOf("text/plain") > -1) {
454+
data = "<pre class='agenda'>" + data + "</pre>";
455+
} else if(t.indexOf("text/html") > -1) {
456+
// nothing to do here
457+
} else {
458+
data = "<p>Unknown type: " + xhr.getResponseHeader("content-type") + "</p>";
459+
}
460+
$(j).html(data);
461+
});
462+
}
449463
});
450464
</script>
451465
{% endblock %}

ietf/templates/meeting/session_agenda_include.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ <h4>Slides</h4>
3838
{% endfor %}
3939
</ul>
4040
{% endif %}
41+
42+
{% with item.session.minutes as minutes %}
43+
{% if minutes %}
44+
{% if minutes.file_extension == "txt" or minutes.file_extension == "html" or minutes.file_extension == "htm" %}
45+
<h4>Minutes</h4>
46+
<div class="frame2" data-src="{{minutes.href}}"></div>
47+
{% else %}
48+
<span class="label label-info">Minutes submitted as {{minutes.file_extension|upper}}</span>
49+
{% endif %}
50+
{% else %}
51+
<span class="label label-warning">No minutes submitted</span>
52+
{% endif %}
53+
{% endwith %}
4154
</div>
4255
<div class="modal-footer">
4356
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

0 commit comments

Comments
 (0)