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 70420380f7
This commit is contained in:
Robert Sparks
parent
1656f58b91
commit
da17e7c9a2
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
]
|
||||
]
|
||||
|
|
@ -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 })
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
|
||||
<li>
|
||||
{{ doc.title }}
|
||||
|
||||
<br><a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{doc.canonical_name}}</a>
|
||||
<a href="{{doc.get_href}}">[txt]</a>
|
||||
|
||||
<div style="padding-left:20px">
|
||||
{{ doc.conflictdoc.title }} ({{ doc.conflictdoc.stream }}: {{ doc.conflictdoc.intended_std_level }})
|
||||
<br><a href="{% url "ietf.doc.views_doc.document_main" name=doc.conflictdoc.canonical_name %}">{{ doc.conflictdoc.canonical_name }}</a>
|
||||
<a href="{{doc.conflictdoc.get_href}}">[txt]</a>
|
||||
{% if doc.conflictdoc.note %}
|
||||
<br>Note: {{ doc.conflictdoc.note|linebreaksbr }}
|
||||
{% endif %}
|
||||
{% for ipr in doc.conflictdoc.ipr %}
|
||||
{% if ipr.disclosure.state.slug == "posted" %}
|
||||
<br>IPR: <a href="https://{{ domain }}/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
Token: {{ doc.ad }}
|
||||
|
||||
{% include "iesg/scribe_doc_ballot.html" %}
|
||||
</li>
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
|
||||
<li>
|
||||
{{ doc.title }} ({{ doc.intended_std_level }})
|
||||
<br><a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
|
||||
{% with doc.rfc_number as rfc_number %}
|
||||
{% if rfc_number %}
|
||||
<a href="http://www.rfc-editor.org/rfc/rfc{{ rfc_number }}/">[txt]</a>
|
||||
{% else %}
|
||||
<a href="{{doc.get_href}}">[txt]</a>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
<br>Token: {{ doc.ad }} ({{ doc.area_acronym }} area)
|
||||
|
||||
{% if doc.note %}
|
||||
<br>Note: {{ doc.note|linebreaksbr }}
|
||||
{% endif %}
|
||||
|
||||
{% for ipr in doc.ipr %}
|
||||
{% if ipr.disclosure.state.slug == "posted" %}
|
||||
<br>IPR: <a href="https://datatracker.ietf.org/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{% include "iesg/scribe_doc_ballot.html" %}
|
||||
</li>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
|
||||
{% with doc.active_ballot as ballot %}
|
||||
{% if ballot %}
|
||||
<br><b>Discusses/comments</b> <a href="https://datatracker.ietf.org/doc/{{doc.canonical_name}}/ballot/">[ballot]</a>:
|
||||
<ul>
|
||||
{% for p in ballot.active_balloter_positions.values %}
|
||||
{% if p.pos %}
|
||||
{% if p.discuss %}
|
||||
<li>
|
||||
<a href="#{{ doc.name }}+{{ p.balloter|slugify }}+discuss">{{ p.balloter }}: Discuss [{{ p.discuss_time }}]</a>:
|
||||
<br>{{ p.discuss }}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if p.comment %}
|
||||
<li>
|
||||
<a href="#{{ doc.name }}+{{ p.balloter|slugify }}+comment">{{ p.balloter }}: Comment [{{ p.comment_time }}]</a>:
|
||||
<br>{{ p.comment }}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
<p><b>Telechat:</b></p>
|
||||
|
||||
<ul>
|
||||
<li>...</li>
|
||||
<li>...</li>
|
||||
<li>...</li>
|
||||
<li>...</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
{% comment %} <!--
|
||||
Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
|
||||
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
|
||||
* Neither the name of the Nokia Corporation and/or its
|
||||
subsidiary(-ies) nor the names of its contributors may be used
|
||||
to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-->{% endcomment %}{% comment %}
|
||||
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
|
||||
{% endcomment %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<!-- Please don't change the doctype. It messes up things for the scribe. -->
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>IESG Agenda - Scribe Template</title>
|
||||
</head>
|
||||
<body>
|
||||
{% load ietf_filters %}{% filter compress_empty_lines %}
|
||||
<h1>Scribe template for IESG Narrative Minutes, {{ date }}</h1>
|
||||
|
||||
{% for num, section in sections %}
|
||||
<p><b>{{ num }}{% if num|sectionlevel == 1 %}.{% endif %} {{ section.title|safe }}</b></p>
|
||||
|
||||
{% if "docs" in section %}
|
||||
<ul>{% for doc in section.docs %}
|
||||
{% if doc.type_id == "draft" or doc.type_id == "statchg" %}{% include "iesg/scribe_doc.html" %}{% endif %}
|
||||
{% if doc.type_id == "conflrev" %}{% include "iesg/scribe_conflict_doc.html" %}{% endif %}
|
||||
{% empty %}
|
||||
<li>(none)</li>{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
<hr>
|
||||
<h2>Appendix: Snapshot of discusses/comments</h2>
|
||||
|
||||
<p>(at {% now "Y-m-d H:i:s T" %})</p>
|
||||
|
||||
{% for doc in appendix_docs %}
|
||||
<!-- ============================================================ -->
|
||||
<p><b>{{ doc.name }}</b></p>
|
||||
|
||||
{% with doc.active_ballot as ballot %}
|
||||
{% if ballot %}
|
||||
<ul>{% for p in ballot.active_balloter_positions.values %}
|
||||
{% if p.pos and p.discuss %}
|
||||
<li>
|
||||
<a name="{{ doc.name }}+{{ p.balloter.plain_name|slugify }}+discuss">{{ p.balloter.plain_name }}: Discuss [{{ p.discuss_time }}]</a>:
|
||||
<br><pre>{{ p.discuss|wordwrap:80 }}</pre>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if p.pos and p.comment %}
|
||||
<li>
|
||||
<a name="{{ doc.name }}+{{ p.balloter.plain_name|slugify }}+comment">{{ p.balloter.plain_name }}: Comment [{{ p.comment_time }}]</a>:
|
||||
<br><pre>{{ p.comment|wordwrap:80 }}</pre>
|
||||
</li>
|
||||
{% endif %}{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
{% endfor %}
|
||||
|
||||
{% endfilter %}
|
||||
</body>
|
||||
</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
|
||||
Loading…
Reference in a new issue