Merged in [19713] from lars@eggert.org:

    Remove ietf/templates/iesg/scribe_template.html and related, 
    which is not used anymore according to the secretariat.
    (On merge, rjsparks@nostrum.com also removed the three other
     templates that only that one included, and removed the test
     that covered the view tht was removed).
 - Legacy-Id: 19732
Note: SVN reference [19713] has been migrated to Git commit 7042038

Author: rjsparks

ietf/iesg/tests.py

@@ -369,17 +369,6 @@ def test_agenda_txt(self):
         # 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)

ietf/iesg/urls.py

@@ -47,7 +47,6 @@
     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 @@
     url(r'^discusses/$', views.discusses),
     url(r'^milestones/$', views.milestones_needing_review),
     url(r'^photos/$', views.photos),
-]
+]

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 })
 
-    
+    

ietf/templates/iesg/scribe_conflict_doc.html

@@ -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