").replace("\n","
\n")
@register.filter(name='indent')
-def indent(value):
- return value.replace("\n", "\n ");
+def indent(value,numspaces=2):
+ return value.replace("\n", "\n"+" "*int(numspaces));
@register.filter(name='parse_email_list')
def parse_email_list(value):
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 90fca0d4a..01686e2d6 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -206,6 +206,9 @@ def agenda_docs(date, next_agenda):
e = m.latest_event(type="started_iesg_process")
m.balloting_started = e.time if e else datetime.datetime.min
+ if m.type_id=='conflrev':
+ m.conflictdoc = m.relateddocument_set.get(relationship__slug='conflrev').target.document
+
docmatches.append(m)
# Be careful to keep this the same as what's used in agenda_documents
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
index da5a61a6f..333075c2a 100644
--- a/ietf/templates/iesg/agenda.html
+++ b/ietf/templates/iesg/agenda.html
@@ -77,8 +77,10 @@ div.agenda-wg { margin-left: 30px; margin-top:0.5em; margin-bottom: 0.5em; width
+ The IESG will use RFC 5742 responses: 1) The IESG has concluded + that there is no conflict between this document and IETF work; 2) + The IESG has concluded that this work is related to IETF work done + in WG <X>, but this relationship does not prevent + publishing; 3) The IESG has concluded that publication could + potentially disrupt the IETF work done in WG <X> and + recommends not publishing the document at this time; 4) The IESG + has concluded that this document violates IETF procedures for + <Y> and should therefore not be published without IETF + review and IESG approval; or 5) The IESG has concluded that this + document extends an IETF protocol in a way that requires IETF + review and should therefore not be published without IETF review + and IESG approval.+{% endif %} +{% endif %}
+
+ The document shepherd must propose one of these responses in the + conflict-review document, and the document shepherd may supply text + for an IESG Note in that document. The Area Director ballot positions + indicate consensus with the response proposed by the document shepherd + and agreement that the IESG should request inclusion of the IESG Note.
+
+ Other matters may be recorded in comments, and the comments will + be passed on to the RFC Editor as community review of the document. +
|
+{{doc.obj.name}}-{{doc.obj.rev}}
+[txt]
+
+ {{ doc.obj.title|escape }} +
+{{doc.obj.conflictdoc.name}}-{{doc.obj.conflictdoc.rev}}
+[txt]
+
+
+Token: {{ doc.obj.ad }}
+{% with doc.obj.active_defer_event as defer %}
+{% if defer %}
+{{ doc.obj.conflictdoc.title|escape }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }}) +{% if doc.obj.conflictdoc.note %} + Note: {{ doc.obj.conflictdoc.note|unescape }} +{% endif %} + +{% if doc.obj.conflictdoc.ipr %} + + IPR:+
Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}} +{% endif %} +{% endwith %} + | +{% ballot_icon doc.obj %} + |
NONE
+{% endfor %} diff --git a/ietf/templates/iesg/agenda_conflict_doc.txt b/ietf/templates/iesg/agenda_conflict_doc.txt new file mode 100644 index 000000000..3c7d920c2 --- /dev/null +++ b/ietf/templates/iesg/agenda_conflict_doc.txt @@ -0,0 +1,51 @@ +{% comment %} +Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +All rights reserved. Contact: Pasi Eronen- The IESG will use RFC 5742 responses: 1) The IESG has concluded - that there is no conflict between this document and IETF work; 2) - The IESG has concluded that this work is related to IETF work done - in WG <X>, but this relationship does not prevent - publishing; 3) The IESG has concluded that publication could - potentially disrupt the IETF work done in WG <X> and - recommends not publishing the document at this time; 4) The IESG - has concluded that this document violates IETF procedures for - <Y> and should therefore not be published without IETF - review and IESG approval; or 5) The IESG has concluded that this - document extends an IETF protocol in a way that requires IETF - review and should therefore not be published without IETF review - and IESG approval.-{% endif %} {% endif %}
-
- (Old instructions) - The document shepherd must propose one of these responses in the - document write-up in the Data Tracker, and the document shepherd - may supply text for an IESG Note in the write-up. The Area - Director ballot positions indicate consensus with the response - proposed by the document shepherd and agreement that the IESG - should request inclusion of the IESG Note.
-
- (New instructions) - The document shepherd must propose one of these responses in the - conflict-review document, and the document shepherd may supply text - for an IESG Note in that document. The Area Director ballot positions - indicate consensus with the response proposed by the document shepherd - and agreement that the IESG should request inclusion of the IESG Note.
-
- Other matters may be recorded in comments, and the comments will - be passed on to the RFC Editor as community review of the document. -
+ Yes No-Objection Discuss Abstain Recuse
+{% for pos in doc.obj.active_ballot.all_positions %}{% if pos.old_ad %}{{pos.ad.plain_name|bracket|ljust:"22"}}{%else%}{{pos.ad.plain_name|ljust:"22"}}{%endif%} {{pos|bracketpos:"yes"}} {{pos|bracketpos:"noobj"}} {{pos|bracketpos:"discuss"}} {{pos|bracketpos:"abstain"}} {{pos|bracketpos:"recuse"}}
+{% endfor %}
+
+
+{% if title1|startswith:"2." %}
+____ open positions
+[ ] would you like to record a position?
____ active discusses
+[ ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?
(Ballot not issued)
+{% endif %} + +{% if title2|startswith:"3.1" or title2|startswith:"3.2" %} +Does anyone have an[y further] objection to this document being published as an {{ doc.obj.intended_std_level }} RFC?
+{% endif %} +{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %} +Does anyone have an objection to the RFC Editor publishing this document as an {{ doc.obj.intended_std_level }} RFC?
+{% endif %} +{% if title3|startswith:"3.3.3" %} +Who will do the review of this document?
+{% endif %} + +Current State: {{ doc.obj.friendly_state }}
+Next State:
+Sub State:
If APPROVED - The Secretariat will send a working group + submission, Protocol Action Announcement.
+ +If APPROVED with caveats - The Secretariat will send a working + group submission, Protocol Action Announcement that includes the + [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that + AD].
+{% endif %} + +{% if title3|startswith:"2.2.1" or title3|startswith:"2.2.2" %} +If APPROVED - The Secretariat will send an individual submission, + Protocol Action Announcement.
+ +If APPROVED with caveats - The Secretariat will send an + individual submission, Protocol Action Announcement that includes + the [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that + AD].
+{% endif %} + +{% if title3|startswith:"3.1.1" or title3|startswith:"3.1.2" %} +If APPROVED - The Secretariat will send a working group submission + Document Action Announcement.
+ +If APPROVED with caveats - The Secretariat will send a working + group submission Document Action announcement that includes the [RFC + Ed. Note, IESG, note, etc.] from [Name that AD].
+{% endif %} + +{% if title3|startswith:"3.2.1" or title3|startswith:"3.2.2" %} +If APPROVED - The Secretariat will send an individual submission + Document Action Announcement.
+ +If APPROVED with caveats - The Secretariat will send an + individual submission Document Action announcement that includes the + [RFC Ed. Note, IESG, note, etc.] from [Name that AD].
+{% endif %} + +{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %} +If APPROVED - The Secretariat will send a standard no problem + message to the RFC Editor. [Name of AD] will you supply the text for + the IESG Note?
+ +If APPROVED with caveats - The Secretariat will send a standard + no problem message to the RFC Editor that includes the note drafted + by [Name that AD].
+ +If NOT APPROVED - The Secretariat will send the standard Do Not + Publish message to the RFC Editor.
+ +If NOT APPROVED with clarifications - The Secretariat will send + the Do Not Publish message to the RFC Editor that includes the note + drafted by[Name the AD].
+{% endif %} + + +{% empty %} +NONE
+{% endfor %} diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html index 7926425e3..8c8eb11d5 100644 --- a/ietf/templates/iesg/moderator_package.html +++ b/ietf/templates/iesg/moderator_package.html @@ -96,8 +96,10 @@ teleconference. The Secretariat will post them in the public archive. {% with "iesg/moderator_doc.html" as doc_template %} +{% with "iesg/moderator_conflict_doc.html" as doc_conflict_template %} {% include "iesg/agenda_outline_23.html" %} {% endwith %} +{% endwith %} diff --git a/ietf/templates/iesg/scribe_conflict_doc.html b/ietf/templates/iesg/scribe_conflict_doc.html new file mode 100644 index 000000000..c76662d6d --- /dev/null +++ b/ietf/templates/iesg/scribe_conflict_doc.html @@ -0,0 +1,98 @@ +{% comment %} +Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +All rights reserved. Contact: Pasi Eronen{{ title1 }}
+ {% endif %} +{{ title2 }}
+ {% endif %}{{ title3 }}
+ +Telechat:
+