Skip to content

Commit 77b5131

Browse files
rjsparksrjsparks
committed
Added more information about RFC5742 conflict review documents to the /agenda, moderator, and scribe pages.
Fixes bug ietf-tools#874 - Legacy-Id: 4840
1 parent 4c4bc99 commit 77b5131

12 files changed

Lines changed: 432 additions & 40 deletions

‎ietf/idtracker/templatetags/ietf_filters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ def format_charter(value):
3131
return value.replace("\n\n", "</p><p>").replace("\n","<br/>\n")
3232

3333
@register.filter(name='indent')
34-
def indent(value):
35-
return value.replace("\n", "\n ");
34+
def indent(value,numspaces=2):
35+
return value.replace("\n", "\n"+" "*int(numspaces));
3636

3737
@register.filter(name='parse_email_list')
3838
def parse_email_list(value):

‎ietf/iesg/views.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ def agenda_docs(date, next_agenda):
206206
e = m.latest_event(type="started_iesg_process")
207207
m.balloting_started = e.time if e else datetime.datetime.min
208208

209+
if m.type_id=='conflrev':
210+
m.conflictdoc = m.relateddocument_set.get(relationship__slug='conflrev').target.document
211+
209212
docmatches.append(m)
210213

211214
# Be careful to keep this the same as what's used in agenda_documents

‎ietf/templates/iesg/agenda.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@ <h3>1.4 List of Remaining Action Items from Last Telechat</h3>
7777

7878
<div id="section23">
7979
{% with "iesg/agenda_doc.html" as doc_template %}
80+
{% with "iesg/agenda_conflict_doc.html" as doc_conflict_template %}
8081
{% include "iesg/agenda_outline_23.html" %}
8182
{% endwith %}
83+
{% endwith %}
8284
</div>
8385

8486
<div id="section4">

‎ietf/templates/iesg/agenda.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ http://datatracker.ietf.org/iesg/agenda/
4848
{{ action_items|indent|indent }}
4949

5050
{% with "iesg/agenda_doc.txt" as doc_template %}
51+
{% with "iesg/agenda_conflict_doc.txt" as doc_conflict_template %}
5152
{% include "iesg/agenda_outline_23.html" %}
5253
{% endwith %}
54+
{% endwith %}
5355

5456
{% with "iesg/agenda_wg.txt" as wg_template %}
5557
{% include "iesg/agenda_outline_4.html" %}

‎ietf/templates/iesg/agenda_conflict_doc.html‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
{% comment %}
2+
Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
3+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above
13+
copyright notice, this list of conditions and the following
14+
disclaimer in the documentation and/or other materials provided
15+
with the distribution.
16+
17+
* Neither the name of the Nokia Corporation and/or its
18+
subsidiary(-ies) nor the names of its contributors may be used
19+
to endorse or promote products derived from this software
20+
without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
{% endcomment %}
34+
{% comment %}
35+
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
36+
{% endcomment %}
37+
{% load ietf_filters %}{% load ballot_icon_redesign %}
38+
39+
{% if title2_first %}{% if title1_first %}<h2>{{ title1 }}</h2>
40+
{% endif %}
41+
<h3>{{ title2 }}</h3>
42+
{% if title2|startswith:"3.3" %}
43+
<blockquote>
44+
The IESG will use RFC 5742 responses: 1) The IESG has concluded
45+
that there is no conflict between this document and IETF work; 2)
46+
The IESG has concluded that this work is related to IETF work done
47+
in WG &lt;X&gt;, but this relationship does not prevent
48+
publishing; 3) The IESG has concluded that publication could
49+
potentially disrupt the IETF work done in WG &lt;X&gt; and
50+
recommends not publishing the document at this time; 4) The IESG
51+
has concluded that this document violates IETF procedures for
52+
&lt;Y&gt; and should therefore not be published without IETF
53+
review and IESG approval; or 5) The IESG has concluded that this
54+
document extends an IETF protocol in a way that requires IETF
55+
review and should therefore not be published without IETF review
56+
and IESG approval.<br/>
57+
<br />
58+
The document shepherd must propose one of these responses in the
59+
conflict-review document, and the document shepherd may supply text
60+
for an IESG Note in that document. The Area Director ballot positions
61+
indicate consensus with the response proposed by the document shepherd
62+
and agreement that the IESG should request inclusion of the IESG Note.<br/>
63+
<br />
64+
Other matters may be recorded in comments, and the comments will
65+
be passed on to the RFC Editor as community review of the document.
66+
</blockquote>
67+
{% endif %}
68+
{% endif %}<h4>{{ title3 }}</h4>
69+
70+
{% for doc in section_docs %}
71+
{% if forloop.first %}
72+
{% endif %}
73+
74+
<table class="agenda-doc">
75+
<tbody>
76+
<tr><td>
77+
<a href="{% url doc_view name=doc.obj.name %}">{{doc.obj.name}}-{{doc.obj.rev}}</a>
78+
<a href="http://www.ietf.org/id/{{doc.obj.name}}-{{doc.obj.rev}}.txt">[txt]</a>
79+
80+
<br/>{{ doc.obj.title|escape }}
81+
<div style="padding-left:30px;">
82+
<a href="{% url doc_view name=doc.obj.conflictdoc.name %}">{{doc.obj.conflictdoc.name}}-{{doc.obj.conflictdoc.rev}}</a>
83+
<a href="http://www.ietf.org/id/{{doc.obj.conflictdoc.name}}-{{doc.obj.conflictdoc.rev}}.txt">[txt]</a>
84+
<br/>{{ doc.obj.conflictdoc.title|escape }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }})
85+
{% if doc.obj.conflictdoc.note %}
86+
<br/>Note: {{ doc.obj.conflictdoc.note|unescape }}
87+
{% endif %}
88+
89+
{% if doc.obj.conflictdoc.ipr %}
90+
<br />
91+
<h5>IPR:</h5>
92+
<ul>
93+
{% for ipr in doc.obj.conflictdoc.ipr %}
94+
{% ifequal ipr.ipr.status 1 %}
95+
<li><a href="/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title|escape }}</a></li>
96+
{% endifequal %}
97+
{% endfor %}
98+
</ul>
99+
100+
{% endif %}
101+
</div>
102+
103+
Token: {{ doc.obj.ad }}
104+
{% with doc.obj.active_defer_event as defer %}
105+
{% if defer %}
106+
<br/>Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}}
107+
{% endif %}
108+
{% endwith %}
109+
</td><td style="padding-left:20px; width: 50px;">
110+
{% ballot_icon doc.obj %}
111+
</td></tr></tbody></table>
112+
{% if forloop.last %}
113+
{% endif %}
114+
{% empty %}
115+
<p>NONE</p>
116+
{% endfor %}

‎ietf/templates/iesg/agenda_conflict_doc.txt‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{% comment %}
2+
Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
3+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above
13+
copyright notice, this list of conditions and the following
14+
disclaimer in the documentation and/or other materials provided
15+
with the distribution.
16+
17+
* Neither the name of the Nokia Corporation and/or its
18+
subsidiary(-ies) nor the names of its contributors may be used
19+
to endorse or promote products derived from this software
20+
without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
{% endcomment %}
34+
{% comment %}
35+
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
36+
{% endcomment %}
37+
{% load ietf_filters %}
38+
{% if title2_first %}{% if title1_first %}{{ title1 }}{% endif %}
39+
{{ title2 }}
40+
{% endif %}{{ title3 }}
41+
{% for doc in section_docs %}
42+
o {{doc.obj.canonical_name}}-{{doc.obj.rev}}
43+
{% filter wordwrap:"68"|indent|indent %}{{ doc.obj.title }}{% endfilter %}
44+
{{doc.obj.conflictdoc.canonical_name}}-{{doc.obj.conflictdoc.rev}}
45+
{% filter wordwrap:"66"|indent:"4" %}{{ doc.obj.conflictdoc.title }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }}){% endfilter %}
46+
{% if doc.obj.conflictdoc.note %}{# note: note is not escaped #} {% filter wordwrap:"64"|indent:"6" %}Note: {{ doc.obj.conflictdoc.note|striptags }}{% endfilter %}
47+
{% endif %} Token: {{ doc.obj.ad }}
48+
{% with doc.obj.active_defer_event as defer %}{% if defer %} Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}}{% endif %}{% endwith %}
49+
{% empty %}
50+
NONE
51+
{% endfor %}

‎ietf/templates/iesg/agenda_doc.html‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -53,41 +53,6 @@ <h3>{{ title2 }}</h3>
5353
which it covers? If not, what changes would make it so?"
5454
</blockquote>
5555
{% endif %}
56-
{% if title2|startswith:"3.3" %}
57-
<blockquote>
58-
The IESG will use RFC 5742 responses: 1) The IESG has concluded
59-
that there is no conflict between this document and IETF work; 2)
60-
The IESG has concluded that this work is related to IETF work done
61-
in WG &lt;X&gt;, but this relationship does not prevent
62-
publishing; 3) The IESG has concluded that publication could
63-
potentially disrupt the IETF work done in WG &lt;X&gt; and
64-
recommends not publishing the document at this time; 4) The IESG
65-
has concluded that this document violates IETF procedures for
66-
&lt;Y&gt; and should therefore not be published without IETF
67-
review and IESG approval; or 5) The IESG has concluded that this
68-
document extends an IETF protocol in a way that requires IETF
69-
review and should therefore not be published without IETF review
70-
and IESG approval.<br/>
71-
<br />
72-
<b>(Old instructions)</b>
73-
The document shepherd must propose one of these responses in the
74-
document write-up in the Data Tracker, and the document shepherd
75-
may supply text for an IESG Note in the write-up. The Area
76-
Director ballot positions indicate consensus with the response
77-
proposed by the document shepherd and agreement that the IESG
78-
should request inclusion of the IESG Note.<br/>
79-
<br />
80-
<b>(New instructions)</b>
81-
The document shepherd must propose one of these responses in the
82-
conflict-review document, and the document shepherd may supply text
83-
for an IESG Note in that document. The Area Director ballot positions
84-
indicate consensus with the response proposed by the document shepherd
85-
and agreement that the IESG should request inclusion of the IESG Note.<br/>
86-
<br />
87-
Other matters may be recorded in comments, and the comments will
88-
be passed on to the RFC Editor as community review of the document.
89-
</blockquote>
90-
{% endif %}
9156
{% endif %}<h4>{{ title3 }}</h4>
9257

9358
{% for doc in section_docs %}

‎ietf/templates/iesg/agenda_outline_23.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,17 @@
123123
{% with 1 as title2_first %}
124124

125125
{% with "3.3.1 New Items" as title3 %}
126-
{% with docs.s331 as section_docs %}{% include doc_template %}{% endwith %}
126+
{% with docs.s331 as section_docs %}{% include doc_conflict_template %}{% endwith %}
127127
{% endwith %}
128128
{% endwith %}{# title2_first #}
129129

130130
{% with "3.3.2 Returning Items" as title3 %}
131-
{% with docs.s332 as section_docs %}{% include doc_template %}{% endwith %}
131+
{% with docs.s332 as section_docs %}{% include doc_conflict_template %}{% endwith %}
132132
{% endwith %}
133133

134134
{% if docs.s333 %}
135135
{% with "3.3.3 For Action" as title3 %}
136-
{% with docs.s333 as section_docs %}{% include doc_template %}{% endwith %}
136+
{% with docs.s333 as section_docs %}{% include doc_conflict_template %}{% endwith %}
137137
{% endwith %}
138138
{% endif %}
139139

0 commit comments

Comments
 (0)