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

Merged in [9789] from lars@netapp.com:

Browse source 
HTML agendas need to be valid HTML5 document.
 - Legacy-Id: 9811
Note: SVN reference [9789] has been migrated to Git commit d633fdc924a0130da98a7dc79768886d95002938
This commit is contained in:
Henrik Levkowetz 2015-07-18 16:35:32 +00:00
parent a5c7693337
commit eb522faa25
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ietf/meeting/views.py
View file

@ -437,16 +437,23 @@ def session_agenda(request, num, session):
if d:
agenda = d[0]
content = read_agenda_file(num, agenda) or "<!doctype html><html lang=en><head><meta charset=utf-8><title>Error</title></head><body><p>Could not read agenda file</p></body></html>"
html5_preamble = "<!doctype html><html lang=en><head><meta charset=utf-8><title>%s</title></head><body>"
html5_postamble = "</body></html>"
content = read_agenda_file(num, agenda)
_, ext = os.path.splitext(agenda.external_url)
ext = ext.lstrip(".").lower()
if ext == "txt":
if not content:
content = "Could not read agenda file '%s'" % agenda.external_url
return HttpResponse(content, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
elif ext == "pdf":
return HttpResponse(content, content_type="application/pdf")
else:
return HttpResponse(content)
if not content:
content = "<p>Could not read agenda file '%s'</p>" % agenda.external_url
agenda = "Error"
return HttpResponse((html5_preamble % agenda) + content + html5_postamble)
raise Http404("No agenda for the %s session of IETF %s is available" % (session, num))

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

@ -424,7 +424,7 @@
if (t.indexOf("text/plain") > -1) {
data = "<pre class='agenda'>" + data + "</pre>";
} else if(t.indexOf("text/html") > -1) {
$(i).addClass("well");
// nothing to do here
} else {
data = "<p>Unknown type: " + xhr.getResponseHeader("content-type") + "</p>";
}