diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index 31d693911..532eb1924 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -369,17 +369,6 @@ class IESGAgendaTests(TestCase): # Make sure the sort places 6.9 before 6.10 self.assertLess(r.content.find(b"6.9"), r.content.find(b"6.10")) - def test_agenda_scribe_template(self): - r = self.client.get(urlreverse("ietf.iesg.views.agenda_scribe_template")) - self.assertEqual(r.status_code, 200) - - for k, d in self.telechat_docs.items(): - if d.type_id == "charter": - continue # scribe template doesn't contain chartering info - - self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name)) - self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title)) - def test_agenda_moderator_package(self): url = urlreverse("ietf.iesg.views.agenda_moderator_package") login_testing_unauthorized(self, "secretary", url) diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py index 749a0c70a..fa6f3dbf7 100644 --- a/ietf/iesg/urls.py +++ b/ietf/iesg/urls.py @@ -47,7 +47,6 @@ urlpatterns = [ url(r'^agenda/(?:%(date)s/)?$' % settings.URL_REGEXPS, views.agenda), url(r'^agenda/(?:%(date)s/)?agenda.txt$' % settings.URL_REGEXPS, views.agenda_txt), url(r'^agenda/(?:%(date)s/)?agenda.json$' % settings.URL_REGEXPS, views.agenda_json), - url(r'^agenda/(?:%(date)s/)?scribe_template.html$' % settings.URL_REGEXPS, views.agenda_scribe_template), url(r'^agenda/(?:%(date)s/)?moderator_package.html$' % settings.URL_REGEXPS, views.agenda_moderator_package), url(r'^agenda/(?:%(date)s/)?agenda_package.txt$' % settings.URL_REGEXPS, views.agenda_package), @@ -58,4 +57,4 @@ urlpatterns = [ url(r'^discusses/$', views.discusses), url(r'^milestones/$', views.milestones_needing_review), url(r'^photos/$', views.photos), -] +] \ No newline at end of file diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index b487aac30..5d1457cee 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -212,21 +212,6 @@ def agenda_txt(request, date=None): "domain": Site.objects.get_current().domain, }, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET) -def agenda_scribe_template(request, date=None): - data = agenda_data(date) - sections = sorted((num, section) for num, section in data["sections"].items() if "2" <= num < "4") - appendix_docs = [] - for num, section in sections: - if "docs" in section: - # why are we here including documents that have no discuss/comment? - appendix_docs.extend(section["docs"]) - return render(request, "iesg/scribe_template.html", { - "date": data["date"], - "sections": sections, - "appendix_docs": appendix_docs, - "domain": Site.objects.get_current().domain, - } ) - @role_required('Area Director', 'Secretariat') def agenda_moderator_package(request, date=None): """Output telechat agenda with one page per section, with each @@ -542,4 +527,4 @@ def photos(request): role.last_initial = role.person.last_name()[0] return render(request, 'iesg/photos.html', {'group_type': 'IESG', 'role': '', 'roles': roles }) - + \ No newline at end of file diff --git a/ietf/templates/iesg/scribe_conflict_doc.html b/ietf/templates/iesg/scribe_conflict_doc.html deleted file mode 100644 index a8cf3a730..000000000 --- a/ietf/templates/iesg/scribe_conflict_doc.html +++ /dev/null @@ -1,24 +0,0 @@ -{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} -
  • - {{ doc.title }} - -
    {{doc.canonical_name}} - [txt] - -
    - {{ doc.conflictdoc.title }} ({{ doc.conflictdoc.stream }}: {{ doc.conflictdoc.intended_std_level }}) -
    {{ doc.conflictdoc.canonical_name }} - [txt] - {% if doc.conflictdoc.note %} -
    Note: {{ doc.conflictdoc.note|linebreaksbr }} - {% endif %} - {% for ipr in doc.conflictdoc.ipr %} - {% if ipr.disclosure.state.slug == "posted" %} -
    IPR: {{ ipr.disclosure.title }} - {% endif %} - {% endfor %} -
    - Token: {{ doc.ad }} - - {% include "iesg/scribe_doc_ballot.html" %} -
    • diff --git a/ietf/templates/iesg/scribe_doc.html b/ietf/templates/iesg/scribe_doc.html deleted file mode 100644 index 77ce7a7b0..000000000 --- a/ietf/templates/iesg/scribe_doc.html +++ /dev/null @@ -1,26 +0,0 @@ -{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} -
  • - {{ doc.title }} ({{ doc.intended_std_level }}) -
    {{ doc.canonical_name }} - {% with doc.rfc_number as rfc_number %} - {% if rfc_number %} - [txt] - {% else %} - [txt] - {% endif %} - {% endwith %} - -
    Token: {{ doc.ad }} ({{ doc.area_acronym }} area) - - {% if doc.note %} -
    Note: {{ doc.note|linebreaksbr }} - {% endif %} - - {% for ipr in doc.ipr %} - {% if ipr.disclosure.state.slug == "posted" %} -
    IPR: {{ ipr.disclosure.title }} - {% endif %} - {% endfor %} - - {% include "iesg/scribe_doc_ballot.html" %} -
    • diff --git a/ietf/templates/iesg/scribe_doc_ballot.html b/ietf/templates/iesg/scribe_doc_ballot.html deleted file mode 100644 index 246a9a5f7..000000000 --- a/ietf/templates/iesg/scribe_doc_ballot.html +++ /dev/null @@ -1,34 +0,0 @@ -{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} -{% with doc.active_ballot as ballot %} - {% if ballot %} -
    Discusses/comments [ballot]: - - {% endif %} -{% endwith %} - -

    Telechat:

    - - diff --git a/ietf/templates/iesg/scribe_template.html b/ietf/templates/iesg/scribe_template.html deleted file mode 100644 index 883591a33..000000000 --- a/ietf/templates/iesg/scribe_template.html +++ /dev/null @@ -1,91 +0,0 @@ -{% comment %} {% endcomment %}{% comment %} -Some parts Copyright (c) 2009 The IETF Trust, all rights reserved. -{% endcomment %} - - - - - IESG Agenda - Scribe Template - - - {% load ietf_filters %}{% filter compress_empty_lines %} -

    Scribe template for IESG Narrative Minutes, {{ date }}

    - - {% for num, section in sections %} -

    {{ num }}{% if num|sectionlevel == 1 %}.{% endif %} {{ section.title|safe }}

    - - {% if "docs" in section %} - - {% endif %} - {% endfor %} - -
    -

    Appendix: Snapshot of discusses/comments

    - -

    (at {% now "Y-m-d H:i:s T" %})

    - - {% for doc in appendix_docs %} - -

    {{ doc.name }}

    - - {% with doc.active_ballot as ballot %} - {% if ballot %} - - {% endif %} - {% endwith %} - - {% endfor %} - - {% endfilter %} - - diff --git a/ietf/utils/crawlurls.txt b/ietf/utils/crawlurls.txt index e2f7bdf2d..30a1d038b 100644 --- a/ietf/utils/crawlurls.txt +++ b/ietf/utils/crawlurls.txt @@ -9,11 +9,10 @@ /iesg/decisions/ /iesg/agenda/documents.txt /iesg/agenda/agenda.json -/iesg/agenda/scribe_template.html /wg/1wg-summary.txt /wg/1wg-summary-by-acronym.txt /wg/1wg-charters.txt /wg/1wg-charters-by-acronym.txt /sitemap.xml /sitemap-ipr.xml -/sitemap-liaison.xml +/sitemap-liaison.xml \ No newline at end of file