altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Added more information about RFC5742 conflict review documents to the /agenda, moderator, and scribe pages.

Browse source 
Fixes bug #874
 - Legacy-Id: 4840
This commit is contained in:
Robert Sparks 2012-09-11 22:31:45 +00:00
parent 4c4bc99f96
commit 77b5131fe6
12 changed files with 432 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/idtracker/templatetags/ietf_filters.py
View file

@ -31,8 +31,8 @@ def format_charter(value):
return value.replace("\n\n", "</p><p>").replace("\n","<br/>\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):

3
ietf/iesg/views.py
View file

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

2
ietf/templates/iesg/agenda.html
View file

@ -77,8 +77,10 @@ div.agenda-wg { margin-left: 30px; margin-top:0.5em; margin-bottom: 0.5em; width
<div id="section23">
{% with "iesg/agenda_doc.html" as doc_template %}
{% with "iesg/agenda_conflict_doc.html" as doc_conflict_template %}
{% include "iesg/agenda_outline_23.html" %}
{% endwith %}
{% endwith %}
</div>
<div id="section4">

2
ietf/templates/iesg/agenda.txt
View file

@ -48,8 +48,10 @@ http://datatracker.ietf.org/iesg/agenda/
{{ action_items|indent|indent }}
{% with "iesg/agenda_doc.txt" as doc_template %}
{% with "iesg/agenda_conflict_doc.txt" as doc_conflict_template %}
{% include "iesg/agenda_outline_23.html" %}
{% endwith %}
{% endwith %}
{% with "iesg/agenda_wg.txt" as wg_template %}
{% include "iesg/agenda_outline_4.html" %}

116
ietf/templates/iesg/agenda_conflict_doc.html Normal file
View file

@ -0,0 +1,116 @@
{% comment %}
Copyright (C) 2008-2010 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 %}
{% load ietf_filters %}{% load ballot_icon_redesign %}
{% if title2_first %}{% if title1_first %}<h2>{{ title1 }}</h2>
{% endif %}
<h3>{{ title2 }}</h3>
{% if title2|startswith:"3.3" %}
<blockquote>
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 &lt;X&gt;, but this relationship does not prevent
publishing; 3) The IESG has concluded that publication could
potentially disrupt the IETF work done in WG &lt;X&gt; and
recommends not publishing the document at this time; 4) The IESG
has concluded that this document violates IETF procedures for
&lt;Y&gt; 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.<br/>
<br />
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.<br/>
<br />
Other matters may be recorded in comments, and the comments will
be passed on to the RFC Editor as community review of the document.
</blockquote>
{% endif %}
{% endif %}<h4>{{ title3 }}</h4>
{% for doc in section_docs %}
{% if forloop.first %}
{% endif %}
<table class="agenda-doc">
<tbody>
<tr><td>
<a href="{% url doc_view name=doc.obj.name %}">{{doc.obj.name}}-{{doc.obj.rev}}</a>
<a href="http://www.ietf.org/id/{{doc.obj.name}}-{{doc.obj.rev}}.txt">[txt]</a>
<br/>{{ doc.obj.title|escape }}
<div style="padding-left:30px;">
<a href="{% url doc_view name=doc.obj.conflictdoc.name %}">{{doc.obj.conflictdoc.name}}-{{doc.obj.conflictdoc.rev}}</a>
<a href="http://www.ietf.org/id/{{doc.obj.conflictdoc.name}}-{{doc.obj.conflictdoc.rev}}.txt">[txt]</a>
<br/>{{ doc.obj.conflictdoc.title|escape }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }})
{% if doc.obj.conflictdoc.note %}
<br/>Note: {{ doc.obj.conflictdoc.note|unescape }}
{% endif %}
{% if doc.obj.conflictdoc.ipr %}
<br />
<h5>IPR:</h5>
<ul>
{% for ipr in doc.obj.conflictdoc.ipr %}
{% ifequal ipr.ipr.status 1 %}
<li><a href="/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title|escape }}</a></li>
{% endifequal %}
{% endfor %}
</ul>
{% endif %}
</div>
Token: {{ doc.obj.ad }}
{% with doc.obj.active_defer_event as defer %}
{% if defer %}
<br/>Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}}
{% endif %}
{% endwith %}
</td><td style="padding-left:20px; width: 50px;">
{% ballot_icon doc.obj %}
</td></tr></tbody></table>
{% if forloop.last %}
{% endif %}
{% empty %}
<p>NONE</p>
{% endfor %}

51
ietf/templates/iesg/agenda_conflict_doc.txt Normal file
View file

@ -0,0 +1,51 @@
{% 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 %}
{% load ietf_filters %}
{% if title2_first %}{% if title1_first %}{{ title1 }}{% endif %}
{{ title2 }}
{% endif %}{{ title3 }}
{% for doc in section_docs %}
o {{doc.obj.canonical_name}}-{{doc.obj.rev}}
{% filter wordwrap:"68"|indent|indent %}{{ doc.obj.title }}{% endfilter %}
{{doc.obj.conflictdoc.canonical_name}}-{{doc.obj.conflictdoc.rev}}
{% filter wordwrap:"66"|indent:"4" %}{{ doc.obj.conflictdoc.title }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }}){% endfilter %}
{% if doc.obj.conflictdoc.note %}{# note: note is not escaped #} {% filter wordwrap:"64"|indent:"6" %}Note: {{ doc.obj.conflictdoc.note|striptags }}{% endfilter %}
{% endif %} Token: {{ doc.obj.ad }}
{% with doc.obj.active_defer_event as defer %}{% if defer %} Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}}{% endif %}{% endwith %}
{% empty %}
NONE
{% endfor %}

35
ietf/templates/iesg/agenda_doc.html
View file

@ -53,41 +53,6 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
which it covers? If not, what changes would make it so?"
</blockquote>
{% endif %}
{% if title2|startswith:"3.3" %}
<blockquote>
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 &lt;X&gt;, but this relationship does not prevent
publishing; 3) The IESG has concluded that publication could
potentially disrupt the IETF work done in WG &lt;X&gt; and
recommends not publishing the document at this time; 4) The IESG
has concluded that this document violates IETF procedures for
&lt;Y&gt; 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.<br/>
<br />
<b>(Old instructions)</b>
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.<br/>
<br />
<b>(New instructions)</b>
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.<br/>
<br />
Other matters may be recorded in comments, and the comments will
be passed on to the RFC Editor as community review of the document.
</blockquote>
{% endif %}
{% endif %}<h4>{{ title3 }}</h4>
{% for doc in section_docs %}

6
ietf/templates/iesg/agenda_outline_23.html
View file

@ -123,17 +123,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% with 1 as title2_first %}
{% with "3.3.1 New Items" as title3 %}
{% with docs.s331 as section_docs %}{% include doc_template %}{% endwith %}
{% with docs.s331 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% endwith %}
{% endwith %}{# title2_first #}
{% with "3.3.2 Returning Items" as title3 %}
{% with docs.s332 as section_docs %}{% include doc_template %}{% endwith %}
{% with docs.s332 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% endwith %}
{% if docs.s333 %}
{% with "3.3.3 For Action" as title3 %}
{% with docs.s333 as section_docs %}{% include doc_template %}{% endwith %}
{% with docs.s333 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% endwith %}
{% endif %}

151
ietf/templates/iesg/moderator_conflict_doc.html Normal file
View file

@ -0,0 +1,151 @@
{% 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 %}
{% load ietf_filters %}
{% for doc in section_docs %}
<h3>{{ title1 }}<br>
{{ title2 }}<br>
{{ title3 }} ({{ forloop.counter }} of {{ section_docs|length }})</h3>
<div><b>{{doc.obj.name}}-{{doc.obj.rev}}</b><br>
<i>({{ doc.obj.title|escape }})</i></div>
<div style="padding-left:20px">
<b>{{doc.obj.conflictdoc.name}}-{{doc.obj.conflictdoc.rev}}</b><br>
<i>({{ doc.obj.conflictdoc.title|escape }})</i><br>
<b>Intended status: {{ doc.obj.conflictdoc.intended_std_level }}<br>
</div>
<div>Token: {{ doc.obj.ad.plain_name|escape }}<br>
{% if doc.obj.type.slug == "draft" %}
Last call ends: {{ doc.obj.most_recent_ietflc.expires.date|default:"(none)" }}
{% if doc.obj.most_recent_ietflc.expires.date|timesince_days < 3 %}!!!{% endif %}
{% endif %}</b></div>
{% if doc.obj.active_ballot %}
<small><pre>
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 %}
</pre></small>
{% if title1|startswith:"2." %}
<p>____ open positions<br>
[ &nbsp; ] would you like to record a position?</p>
{% endif %}
<p>____ active discusses<br>
[ &nbsp; ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?</p>
{% else %}
<p>(Ballot not issued)</p>
{% endif %}
{% if title2|startswith:"3.1" or title2|startswith:"3.2" %}
<p>Does anyone have an[y further] objection to this document being published as an {{ doc.obj.intended_std_level }} RFC?</p>
{% endif %}
{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %}
<p>Does anyone have an objection to the RFC Editor publishing this document as an {{ doc.obj.intended_std_level }} RFC?</p>
{% endif %}
{% if title3|startswith:"3.3.3" %}
<p>Who will do the review of this document?</p>
{% endif %}
<p>Current State: {{ doc.obj.friendly_state }}<br>
Next State:<br>
Sub State: </p>
{% if title3|startswith:"2.1.1" or title3|startswith:"2.1.2" %}
<p>If APPROVED - The Secretariat will send a working group
submission, Protocol Action Announcement.</p>
<p>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].</p>
{% endif %}
{% if title3|startswith:"2.2.1" or title3|startswith:"2.2.2" %}
<p>If APPROVED - The Secretariat will send an individual submission,
Protocol Action Announcement.</p>
<p>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].</p>
{% endif %}
{% if title3|startswith:"3.1.1" or title3|startswith:"3.1.2" %}
<p>If APPROVED - The Secretariat will send a working group submission
Document Action Announcement.</p>
<p>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].</p>
{% endif %}
{% if title3|startswith:"3.2.1" or title3|startswith:"3.2.2" %}
<p>If APPROVED - The Secretariat will send an individual submission
Document Action Announcement.</p>
<p>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].</p>
{% endif %}
{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %}
<p>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?</p>
<p>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].</p>
<p>If NOT APPROVED - The Secretariat will send the standard Do Not
Publish message to the RFC Editor.</p>
<p>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].</p>
{% endif %}
{% empty %}
<h3>{{ title1 }}<br>
{{ title2 }}<br>
{{ title3 }}</h3>
<p>NONE</p>
{% endfor %}

2
ietf/templates/iesg/moderator_package.html
View file

@ -96,8 +96,10 @@ teleconference. The Secretariat will post them in the public archive.</p>
<!-- ===================================================================== -->
{% 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 %}
<!-- ===================================================================== -->
<!-- SECTION 4 -->

98
ietf/templates/iesg/scribe_conflict_doc.html Normal file
View file

@ -0,0 +1,98 @@
{% 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 %}
{% load ietf_filters %}
{% if title2_first %}
{% if title1_first %}
<p><b>{{ title1 }}</b></p>
{% endif %}
<p><b>{{ title2 }}</b></p>
{% endif %}<p><b>{{ title3 }}</b></p>
<ul>
{% for doc in section_docs %}
<li>
{{ doc.obj.title|escape }}
<br/><a href="{% url doc_view name=doc.obj.canonical_name %}">{{doc.obj.canonical_name}}</a>
<a href="http://www.ietf.org/id/{{doc.obj.canonical_name}}-{{doc.obj.rev}}.txt">[txt]</a>
<div style="padding-left:20px">
{{ doc.obj.conflictdoc.title|escape }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }})
<br/><a href="{% url doc_view name=doc.obj.conflictdoc.canonical_name %}">{{doc.obj.conflictdoc.canonical_name}}</a>
<a href="http://www.ietf.org/id/{{doc.obj.conflictdoc.canonical_name}}-{{doc.obj.conflictdoc.rev}}.txt">[txt]</a>
{% if doc.obj.conflictdoc.note %}{# note: note is not escaped #}
<br/>Note: {{ doc.obj.conflictdoc.note|safe }}
{% endif %}
{% for ipr in doc.obj.conflictdoc.ipr %}
{% ifequal ipr.ipr.status 1 %}
<br/>IPR: <a href="http://datatracker.ietf.org/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title|escape }}</a>
{% endifequal %}
{% endfor %}
</div>
Token: {{ doc.obj.ad.plain_name|escape }}
{% if doc.obj.active_ballot %}
<br/><b>Discusses/comments</b> <a href="http://datatracker.ietf.org/idtracker/ballot/{{doc.obj.canonical_name}}/">[ballot]</a>:
<ul>
{% for p in doc.obj.active_ballot.active_ad_positions.values %}
{% if p.pos %}
{% if p.discuss %}
<li>
<a href="#{{doc.obj.name}}+{{p.ad|slugify}}+discuss">{{ p.ad }}: Discuss [{{ p.discuss_time }}]</a>:
<br/>{{ p.discuss }}
</li>
{% endif %}
{% if p.comment %}
<li>
<a href="#{{doc.obj.name}}+{{p.ad|slugify}}+comment">{{ p.ad }}: Comment [{{ p.comment_time }}]</a>:
<br/>{{ p.comment }}
</li>
{% endif %}
{% endif %}
{% endfor %}
</ul>
{% endif %}
<p><b>Telechat:</b></p>
<ul>
<li>...</li>
<li>...</li>
<li>...</li>
<li>...</li>
<li>...</li>
</ul>
</li>
{% empty %}
<li>(none)</li>
{% endfor %}
</ul>

2
ietf/templates/iesg/scribe_template.html
View file

@ -44,8 +44,10 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
<h1>Scribe template for IESG Narrative Minutes, {{date}}</h1>
{% with "iesg/scribe_doc.html" as doc_template %}
{% with "iesg/scribe_conflict_doc.html" as doc_conflict_template %}
{% include "iesg/agenda_outline_23.html" %}
{% endwith %}
{% endwith %}
<hr/>
<h2>Appendix: Snapshot of discusses/comments</h2>