Put status changes on the agenda, moderator, and package pages

- Legacy-Id: 5331
This commit is contained in:
Robert Sparks 2013-01-28 20:16:17 +00:00
parent c67661311f
commit 1cff6187f5
8 changed files with 118 additions and 210 deletions

View file

@ -159,21 +159,28 @@ def get_doc_sectionREDESIGN(doc):
s = s + "1"
elif doc.type_id == 'charter':
s = get_wg_section(doc.group)
elif doc.type_id == 'statchg':
protocol_action = False
for relation in doc.relateddocument_set.filter(relationship__slug__in=('tops','tois','tohist','toinf','tobcp','toexp')):
if relation.relationship.slug in ('tops','tois') or relation.target.document.std_level.slug in ('std','ds','ps'):
protocol_action = True
if protocol_action:
s="23"
else:
s="33"
if doc.get_state_slug() not in ("iesgeval", "defer", "appr-pr", "appr-pend", "appr-sent"):
s = s + "3"
elif doc.returning_item():
s = s + "2"
else:
s = s + "1"
elif doc.type_id == 'conflrev':
if doc.get_state('conflrev').slug not in ('adrev','iesgeval','appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent','defer'):
s = "333"
s = "343"
elif doc.returning_item():
s = "332"
s = "342"
else:
s = "331"
elif doc.type_id == 'statchg':
# TODO This is WRONG
s="211"
#protocol_action = False
#for relation in doc.relateddocument_set.filter(relationship__in="('tops','tois','tohist','toinf','tobcp,'toexp')"):
# if relation.relationship.slug in ('tops','tois') or relation.target.document.std_level.slug in ('std','ds','ps'):
# protocol_action = True
#if protocol_action:
s = "341"
return s
@ -233,6 +240,8 @@ def agenda_docs(date, next_agenda):
docmatches.sort(key=lambda d: d.balloting_started)
res = dict(("s%s%s%s" % (i, j, k), []) for i in range(2, 5) for j in range (1, 4) for k in range(1, 4))
for k in range(1,4):
res['s34%d'%k]=[]
for id in docmatches:
section_key = "s"+get_doc_section(id)
if section_key not in res:
@ -287,6 +296,9 @@ def _agenda_json(request, date=None):
data['sections']['2.2'] = {'title':"Individual Submissions"}
data['sections']['2.2.1'] = {'title':"New Items", 'docs':[]}
data['sections']['2.2.2'] = {'title':"Returning Items", 'docs':[]}
data['sections']['2.3'] = {'title':"Individual Submissions"}
data['sections']['2.3.1'] = {'title':"New Items", 'docs':[]}
data['sections']['2.3.2'] = {'title':"Returning Items", 'docs':[]}
data['sections']['3'] = {'title':"Document Actions"}
data['sections']['3.1'] = {'title':"WG Submissions"}
data['sections']['3.1.1'] = {'title':"New Items", 'docs':[]}
@ -294,9 +306,12 @@ def _agenda_json(request, date=None):
data['sections']['3.2'] = {'title':"Individual Submissions Via AD"}
data['sections']['3.2.1'] = {'title':"New Items", 'docs':[]}
data['sections']['3.2.2'] = {'title':"Returning Items", 'docs':[]}
data['sections']['3.3'] = {'title':"IRTF and Independent Submission Stream Documents"}
data['sections']['3.3'] = {'title':"Status Changes"}
data['sections']['3.3.1'] = {'title':"New Items", 'docs':[]}
data['sections']['3.3.2'] = {'title':"Returning Items", 'docs':[]}
data['sections']['3.4'] = {'title':"IRTF and Independent Submission Stream Documents"}
data['sections']['3.4.1'] = {'title':"New Items", 'docs':[]}
data['sections']['3.4.2'] = {'title':"Returning Items", 'docs':[]}
data['sections']['4'] = {'title':"Working Group Actions"}
data['sections']['4.1'] = {'title':"WG Creation"}
data['sections']['4.1.1'] = {'title':"Proposed for IETF Review", 'wgs':[]}

View file

@ -39,7 +39,7 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% if title2_first %}{% if title1_first %}<h2>{{ title1 }}</h2>
{% endif %}
<h3>{{ title2 }}</h3>
{% if title2|startswith:"3.3" %}
{% if title2|startswith:"3.4" %}
<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)

View file

@ -1,143 +0,0 @@
{% extends "base.html" %}
{% comment %}
Copyright (C) 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 %}
{% load ballot_icon %}
{% load ietf_filters %}
{% block title %}Documents on Future IESG Telechat Agendas{% endblock %}
{% block morecss %}
.agenda_docs tr.oddrow {background-color: #EDF5FF; }
.agenda_docs tr.header.telechat_date { margin-top:10px; background:#2647A0; color: white;}
.agenda_docs tr.header.telechat_date td { font-size: 125%; }
.agenda_docs tr.header + tr.header { border-top: 2px solid white;}
.agenda_docs tr td {
vertical-align: top;
}
.agenda_docs tr .reschedule,
.agenda_docs tr .clear-returning-item {
font-size: 11px;
}
.agenda_docs tr .doc_pages {
font-size:80%; font-style:italic;
}
.secretariat-actions {
margin-bottom: 10px;
}
{% endblock %}
{% block pagehead %}
<link rel="alternate" type="application/atom+xml" href="/feed/iesg-agenda/" />
{% endblock %}
{% block content %}
<h1>Documents on Future IESG Telechat Agendas</h1>
<form action="" method="POST">
{% if user|in_group:"Secretariat" %}
<div class="secretariat-actions">
<button id="clear-all-on-schedule">Set all to not on agenda</button>
<input type="submit" value="Save"/>
</div>
{% endif %}
<table class="ietf-table ietf-doctable agenda_docs">
{% for t in telechats %}
{% if not forloop.first %}
<tr class="header"><td colspan="6">&nbsp;</td></tr>
{% endif %}
<tr class="header telechat_date"><td colspan="6">IESG telechat {{t.date}}</td></tr>
{% if forloop.first %}
<tr class="header"><td colspan="6"><a href="/iesg/agenda/">Full IESG Agenda</a></td></tr>
{% endif %}
<tr class="header"><td colspan="6"><a href="/iesg/agenda/telechat-{{t.date|date:"Y"}}-{{t.date|date:"m"}}-{{t.date|date:"d"}}-docs.tgz">Download Documents</a></td></tr>
<tr class="header"><td colspan="6">2. Protocol Actions</td></tr>
<tr class="header"><td colspan="6">2.1 WG Submissions</td></tr>
{% for doc in t.docs.s211 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s212 %}<tr class="header"><td colspan="6">2.1.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s212 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s213 %}<tr class="header"><td colspan="6">2.1.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s213 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
<tr class="header"><td colspan="6">2.2 Individual Submissions</td></tr>
{% for doc in t.docs.s221 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s222 %}<tr class="header"><td colspan="6">2.2.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s222 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s223 %}<tr class="header"><td colspan="6">2.2.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s223 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
<tr class="header"><td colspan="6">3. Document Actions</td></tr>
<tr class="header"><td colspan="6">3.1 WG Submissions</td></tr>
{% for doc in t.docs.s311 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s312 %}<tr class="header"><td colspan="6">3.1.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s312 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s313 %}<tr class="header"><td colspan="6">3.1.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s313 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
<tr class="header"><td colspan="6">3.2 Individual Submissions Via AD</td></tr>
{% for doc in t.docs.s321 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s322 %}<tr class="header"><td colspan="6">3.2.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s322 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s323 %}<tr class="header"><td colspan="6">3.2.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s323 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
<tr class="header"><td colspan="6">3.3 IRTF and Independent Submission Stream Documents</td></tr>
{% for doc in t.docs.s331 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s332 %}<tr class="header"><td colspan="6">3.3.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s332 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% if t.docs.s333 %}<tr class="header"><td colspan="6">3.3.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s333 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
{% endfor %}
</table>
</form>
{% endblock content %}
{% block content_end %}
<script type="text/javascript" src="/js/agenda-documents.js"></script>
{% endblock %}

View file

@ -105,6 +105,14 @@ font-size:80%; font-style:italic;
{% if t.docs.s223 %}<tr class="header"><td colspan="6">2.2.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s223 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
<tr class="header"><td colspan="6">2.3 Status Changes</td></tr>
{% for doc in t.docs.s231 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
{% if t.docs.s222 %}<tr class="header"><td colspan="6">2.3.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s232 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
{% if t.docs.s223 %}<tr class="header"><td colspan="6">2.3.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s233 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
<tr class="header"><td colspan="6">3. Document Actions</td></tr>
<tr class="header"><td colspan="6">3.1 WG Submissions</td></tr>
@ -123,7 +131,7 @@ font-size:80%; font-style:italic;
{% if t.docs.s323 %}<tr class="header"><td colspan="6">3.2.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s323 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
<tr class="header"><td colspan="6">3.3 IRTF and Independent Submission Stream Documents</td></tr>
<tr class="header"><td colspan="6">3.3 Status Changes</td></tr>
{% for doc in t.docs.s331 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
{% if t.docs.s332 %}<tr class="header"><td colspan="6">3.3.2 Returning Item</td></tr>{% endif %}
@ -131,6 +139,14 @@ font-size:80%; font-style:italic;
{% if t.docs.s333 %}<tr class="header"><td colspan="6">3.3.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s333 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
<tr class="header"><td colspan="6">3.4 IRTF and Independent Submission Stream Documents</td></tr>
{% for doc in t.docs.s341 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
{% if t.docs.s342 %}<tr class="header"><td colspan="6">3.4.2 Returning Item</td></tr>{% endif %}
{% for doc in t.docs.s342 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
{% if t.docs.s343 %}<tr class="header"><td colspan="6">3.4.3 For Action</td></tr>{% endif %}
{% for doc in t.docs.s343 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
<tr class="header"><td colspan="6">4. Working Group Actions</td></tr>
{% if t.docs.s411 or t.docs.s412%}<tr class="header"><td colspan="6">4.1 WG Creation</td></tr>{% endif %}

View file

@ -73,8 +73,29 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% endwith %}{# title2 #}
{% with "2.3 Status Changes" as title2 %}
{% with 1 as title2_first %}
{% with "2.3.1 New Items" as title3 %}
{% with docs.s231 as section_docs %}{% include doc_template %}{% endwith %}
{% endwith %}
{% endwith %}{# title2_first #}
{% with "2.3.2 Returning Items" as title3 %}
{% with docs.s232 as section_docs %}{% include doc_template %}{% endwith %}
{% endwith %}
{% if docs.s233 %}
{% with "2.3.3 For Action" as title3 %}
{% with docs.s233 as section_docs %}{% include doc_template %}{% endwith %}
{% endwith %}
{% endif %}
{% endwith %}{# title2 #}
{% endwith %}{# title1 #}
{% with "3. Document Actions" as title1 %}{% with 1 as title1_first %}
{% with "3.1 WG Submissions" as title2 %}
@ -119,21 +140,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% endwith %}{# title2 #}
{% with "3.3 IRTF and Independent Submission Stream Documents" as title2 %}
{% with "3.3 Status Changes" as title2 %}
{% with 1 as title2_first %}
{% with "3.3.1 New Items" as title3 %}
{% with docs.s331 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% with docs.s331 as section_docs %}{% include doc_template %}{% endwith %}
{% endwith %}
{% endwith %}{# title2_first #}
{% with "3.3.2 Returning Items" as title3 %}
{% with docs.s332 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% with docs.s332 as section_docs %}{% include doc_template %}{% endwith %}
{% endwith %}
{% if docs.s333 %}
{% with "3.3.3 For Action" as title3 %}
{% with docs.s333 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% with docs.s333 as section_docs %}{% include doc_template %}{% endwith %}
{% endwith %}
{% endif %}
{% endwith %} {# title2 #}
{% with "3.4 IRTF and Independent Submission Stream Documents" as title2 %}
{% with 1 as title2_first %}
{% with "3.4.1 New Items" as title3 %}
{% with docs.s341 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% endwith %}
{% endwith %}{# title2_first #}
{% with "3.4.2 Returning Items" as title3 %}
{% with docs.s342 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% endwith %}
{% if docs.s343 %}
{% with "3.4.3 For Action" as title3 %}
{% with docs.s343 as section_docs %}{% include doc_conflict_template %}{% endwith %}
{% endwith %}
{% endif %}

View file

@ -60,11 +60,6 @@ Last call ends: {{ doc.obj.most_recent_ietflc.expires.date|default:"(none)" }}
{% 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>
@ -72,13 +67,10 @@ Last call ends: {{ doc.obj.most_recent_ietflc.expires.date|default:"(none)" }}
<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" %}
{% if title3|startswith:"3.4.1" or title3|startswith:"3.4.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" %}
{% if title3|startswith:"3.4.3" %}
<p>Who will do the review of this document?</p>
{% endif %}
@ -86,45 +78,7 @@ Last call ends: {{ doc.obj.most_recent_ietflc.expires.date|default:"(none)" }}
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" %}
{% if title3|startswith:"3.4.1" or title3|startswith:"3.4.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>

View file

@ -102,6 +102,16 @@ Sub State: </p>
AD].</p>
{% endif %}
{% if title3|startswith:"2.3.1" or title3|startswith:"2.3.2" %}
<p>If APPROVED - The Secretariat will send the associated status change
Protocol Action Announcements.</p>
<p>If APPROVED with caveats - The Secretariat will send the
associated status change Protocol Action Announcements 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>
@ -121,6 +131,15 @@ Sub State: </p>
{% endif %}
{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %}
<p>If APPROVED - The Secretariat will send the associated status change
Document Action Announcements.</p>
<p>If APPROVED with caveats - The Secretariat will send the associated
status change Document Action announcements that includes the [RFC
Ed. Note, IESG, note, etc.] from [Name that AD].</p>
{% endif %}
{% if title3|startswith:"3.4.1" or title3|startswith:"3.4.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>

View file

@ -60,6 +60,9 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% for doc in docs.s221 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s222 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s223 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s231 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s232 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s233 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s311 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s312 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s313 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
@ -69,6 +72,9 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% for doc in docs.s331 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s332 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s333 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s341 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s342 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% for doc in docs.s343 %}{% include "iesg/scribe_doc2.html" %}{%endfor%}
{% endfilter %}
</body>