From eb522faa25256f604c9aa8b4840672c4e986b87e Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 18 Jul 2015 16:35:32 +0000 Subject: [PATCH] Merged in [9789] from lars@netapp.com: HTML agendas need to be valid HTML5 document. - Legacy-Id: 9811 Note: SVN reference [9789] has been migrated to Git commit d633fdc924a0130da98a7dc79768886d95002938 --- ietf/meeting/views.py | 11 +++++++++-- ietf/templates/meeting/agenda.html | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 6142bba3e..1da6f298c 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -437,16 +437,23 @@ def session_agenda(request, num, session): if d: agenda = d[0] - content = read_agenda_file(num, agenda) or "Error

Could not read agenda file

" + html5_preamble = "%s" + html5_postamble = "" + 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 = "

Could not read agenda file '%s'

" % 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)) diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 41e9fcd22..7f375c2d0 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -424,7 +424,7 @@ if (t.indexOf("text/plain") > -1) { data = "
" + data + "
"; } else if(t.indexOf("text/html") > -1) { - $(i).addClass("well"); + // nothing to do here } else { data = "

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

"; }