altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [16152] from rjsparks@nostrum.com:

Browse source 
Show minutes on the popup for the meeting materials button on the agenda page when those minutes are available. Fixes #2711.
 - Legacy-Id: 16162
Note: SVN reference [16152] has been migrated to Git commit 88f49ed2b4
This commit is contained in:
Henrik Levkowetz 2019-04-25 14:23:09 +00:00
parent 87e94fae11 88f49ed2b4
commit 19226d8cee
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/templates/meeting/agenda.html
View file

@ -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 = "<pre class='agenda'>" + data + "</pre>";
} else if(t.indexOf("text/html") > -1) {
// nothing to do here
} else {
data = "<p>Unknown type: " + xhr.getResponseHeader("content-type") + "</p>";
}
$(j).html(data);
});
}
});
</script>
{% endblock %}

13
ietf/templates/meeting/session_agenda_include.html
View file

@ -38,6 +38,19 @@
{% endfor %}
</ul>
{% endif %}
{% with item.session.minutes as minutes %}
{% if minutes %}
{% if minutes.file_extension == "txt" or minutes.file_extension == "html" or minutes.file_extension == "htm" %}
<h4>Minutes</h4>
<div class="frame2" data-src="{{minutes.href}}"></div>
{% else %}
<span class="label label-info">Minutes submitted as {{minutes.file_extension|upper}}</span>
{% endif %}
{% else %}
<span class="label label-warning">No minutes submitted</span>
{% endif %}
{% endwith %}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>