diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index a617bd050..aed578d1e 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -446,6 +446,20 @@ $(i).html(data); }); } + var j = $(this).find(".frame2"); + if ($(j).data("src")) { + $.get($(j).data("src"), function (data, status, xhr) { + var t = xhr.getResponseHeader("content-type"); + if (t.indexOf("text/plain") > -1) { + data = "
" + data + "
"; + } else if(t.indexOf("text/html") > -1) { + // nothing to do here + } else { + data = "

Unknown type: " + xhr.getResponseHeader("content-type") + "

"; + } + $(j).html(data); + }); + } }); {% endblock %} diff --git a/ietf/templates/meeting/session_agenda_include.html b/ietf/templates/meeting/session_agenda_include.html index 31e233899..72cf127c4 100644 --- a/ietf/templates/meeting/session_agenda_include.html +++ b/ietf/templates/meeting/session_agenda_include.html @@ -38,6 +38,19 @@ {% endfor %} {% endif %} + + {% with item.session.minutes as minutes %} + {% if minutes %} + {% if minutes.file_extension == "txt" or minutes.file_extension == "html" or minutes.file_extension == "htm" %} +

Minutes

+
+ {% else %} + Minutes submitted as {{minutes.file_extension|upper}} + {% endif %} + {% else %} + No minutes submitted + {% endif %} + {% endwith %}