Skip to content

Commit 92e2b8c

Browse files
pasieronenpasieronen
committed
Added first beta of IESG telechat moderator package (not fully working yet)
 - Legacy-Id: 1875
1 parent 0773ac9 commit 92e2b8c

6 files changed

Lines changed: 307 additions & 2 deletions

File tree

‎ietf/iesg/testurl.list‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77
200 /iesg/agenda/
88
200 /iesg/agenda/agenda.txt
9+
200 /iesg/agenda/scribe_template.html
10+
200 /iesg/agenda/moderator_package.html
911
200 /iesg/agenda/documents.txt
1012
200 /iesg/agenda/documents/
1113
200 /iesg/discusses/
12-
200 /iesg/agenda/scribe_template.html
1314

1415
200 /iesg/ann/ind/
1516
200 /iesg/ann/new/

‎ietf/iesg/urls.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
(r'^agenda/$', views.agenda),
5454
(r'^agenda/agenda.txt$', views.agenda_txt),
5555
(r'^agenda/scribe_template.html$', views.agenda_scribe_template),
56+
(r'^agenda/moderator_package.html$', views.agenda_moderator_package),
5657
(r'^agenda/documents.txt$', views.agenda_documents_txt),
5758
(r'^agenda/documents/$', views.agenda_documents),
5859
(r'^discusses/$', views.discusses),

‎ietf/iesg/views.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434

3535
import codecs
36-
from ietf.idtracker.models import IDInternal, InternetDraft,AreaGroup, Position
36+
from ietf.idtracker.models import IDInternal, InternetDraft,AreaGroup, Position, IESGLogin
3737
from django.views.generic.list_detail import object_list
3838
from django.views.generic.simple import direct_to_template
3939
from django.http import Http404, HttpResponse
@@ -179,6 +179,11 @@ def agenda_scribe_template(request):
179179
docs = agenda_docs(date, True)
180180
return render_to_response('iesg/scribe_template.html', {'date':str(date), 'docs':docs}, context_instance=RequestContext(request) )
181181

182+
def agenda_moderator_package(request):
183+
data = _agenda_data(request)
184+
data['ad_names'] = [str(x) for x in IESGLogin.active_iesg()]
185+
return render_to_response("iesg/moderator_package.html", data, context_instance=RequestContext(request))
186+
182187
def agenda_documents_txt(request):
183188
dates = TelechatDates.objects.all()[0].dates()
184189
docs = []

‎ietf/templates/iesg/moderator_doc.html‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
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+
{% for doc in section_docs %}
39+
<h3>{{ title1 }}<br>
40+
{{ title2 }}<br>
41+
{{ title3 }} ({{ forloop.counter }} of {{ section_docs|length }})</h3>
42+
43+
<p><b>{{doc.obj.document.filename}}{% if not doc.obj.rfc_flag %}-{{doc.obj.document.revision}}{% endif %}</b><br>
44+
<i>({{ doc.obj.document.title|escape }})</i><br>
45+
<b>Intended Status: {{ doc.obj.document.intended_status }}<br>
46+
Token: {{ doc.obj.token_name|escape }}</b></p>
47+
48+
<small><pre>{% if doc.obj.ballot.active %}
49+
Yes No-Objection Discuss Abstain
50+
{% if not doc.obj.ballot.an_sent %}{% for curpos in doc.obj.ballot.active_positions %}{{ curpos.ad|ljust:"20" }} {{ curpos.pos.yes|bracket }} {{ curpos.pos.noobj|bracket }} {{ curpos.pos.discuss|bracket }} {{ curpos.pos.abstain_ind|bracket }}
51+
{% endfor %}
52+
{% endif %}{% for position in doc.obj.ballot.positions.all|dictsort:"ad.last_name" %}{% if doc.obj.ballot.an_sent or not position.ad.is_current_ad %}{{ position.ad|ljust:"20" }} {{ position.yes|bracket }} {{ position.noobj|bracket }} {{ position.discuss|bracket }} {{ position.abstain_ind|bracket }}
53+
{% endif %}{% endfor %}{% else %}(Ballot not issued){% endif %}</pre></small>
54+
55+
{% if doc.obj.document.lc_expiration_date and doc.obj.document.lc_expiration_date|timesince_days|less_than:"1" %}<p><b>NOTE: Last Call expires on {{ doc.obj.document.lc_expiration_date }}.</b></p>{% endif %}
56+
57+
<p>____ open positions<br>
58+
<b>[ &nbsp; ] would you like to record a position?</b></p>
59+
60+
<p>____ active discusses<br>
61+
<b>[ &nbsp; ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?</b></p>
62+
63+
{% ifequal title1 "2. Protocol Actions" %}
64+
<p>"Yes" or "No-Objection" positions from 2/3 of non-recused ADs,
65+
with no "Discuss" positions, are needed for approval.</p>
66+
{% else %}
67+
<p>1 "Yes" with no "Discuss" positions are needed for approval.</p>
68+
{% endifequal %}
69+
70+
<p>Current State: {{ doc.obj.cur_state }}, sub state: {{ doc.obj.cur_sub_state|default:"(none)" }}<br>
71+
Next State:<br>
72+
Sub State: </p>
73+
74+
{% if title2|startswith:"3.3" %}
75+
<p>(Text for RFC Editor submissions still missing)</p>
76+
{% else %}
77+
<p><i>If APPROVED - The Secretariat will send
78+
{% if title2|startswith:"2.1" or title2|startswith:"3.1" %}a working group{%else%}an individual{%endif%} submission,
79+
{% if title1|startswith:"2." %}Protocol{%else%}Document{%endif%} Action
80+
Announcement.</i>
81+
82+
<p><i>If APPROVED with caveats - The Secretariat will send
83+
{% if title2|startswith:"2.1" or title2|startswith:"3.1" %}a working group{%else%}an individual{%endif%} submission,
84+
{% if title1|startswith:"2." %}Protocol{%else%}Document{%endif%} Action
85+
Announcement that includes the [RFC
86+
Editor Note, IESG Note, etc.] to be drafted by [Name that AD].</i></p>
87+
{% endif %}
88+
89+
{% empty %}
90+
<h3>{{ title1 }}<br>
91+
{{ title2 }}<br>
92+
{{ title3 }}</h3>
93+
94+
<p>NONE</p>
95+
{% endfor %}

‎ietf/templates/iesg/moderator_package.html‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
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 %}{% comment %}
34+
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
35+
{% endcomment %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
36+
<html><head>
37+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
38+
<style type="text/css">
39+
h3 { page-break-before:always; }
40+
@media print {
41+
html { margin: 0; }
42+
body { margin: 0; }
43+
h3 { margin-top: 0; }
44+
}
45+
@media screen {
46+
h3 { border-top: 1px dotted #a0a0a0; padding-top: 1em; }
47+
}
48+
</style>
49+
</head>
50+
<body>
51+
52+
<h1>Moderator Package for {{date}} IESG Telechat</h1>
53+
54+
<p>Generated at {% now "Y-m-d H:i:s T" %}.</p>
55+
56+
<!-- ===================================================================== -->
57+
<!-- SECTION 1 -->
58+
<!-- ===================================================================== -->
59+
60+
<h3>1. Administrivia<br>1.1 Roll Call</h3>
61+
62+
<h3>1. Administrivia<br>1.2 Bash the Agenda</h3>
63+
64+
<p><b>Does anyone want to add anything NEW to the agenda?</b></p>
65+
66+
<p><b>Does anyone have any other changes to the agenda as it stands?</b></b>
67+
68+
<h3>1. Administrivia<br>1.3 Approval of the Minutes of Past Telechats</h3>
69+
70+
<p><b>Does anyone have an objection to the minutes of the &lt;DATE&gt; IESG
71+
Teleconference being approved?</b></p>
72+
73+
<p><b>IF APPROVED: The minutes are approved for the &LT;DATE&gt;
74+
teleconference. The Secretariat will post them in the public archive.</b></p>
75+
76+
<p><b>Are there narrative minutes to approve for today?</b></p>
77+
78+
<h3>1. Administrivia<br>1.4 List of Remaining Action Items from Last Telehat</h3>
79+
80+
<pre>
81+
{{ action_items }}
82+
</pre>
83+
84+
<!-- ===================================================================== -->
85+
<!-- SECTIONS 2+3 -->
86+
<!-- ===================================================================== -->
87+
88+
{% with "iesg/moderator_doc.html" as doc_template %}
89+
{% include "iesg/agenda_outline_23.html" %}
90+
{% endwith %}
91+
92+
<!-- ===================================================================== -->
93+
<!-- SECTION 4 -->
94+
<!-- ===================================================================== -->
95+
96+
{% with "iesg/moderator_wg.html" as wg_template %}
97+
{% include "iesg/agenda_outline_4.html" %}
98+
{% endwith %}
99+
100+
<!-- ===================================================================== -->
101+
<!-- SECTION 5 -->
102+
<!-- ===================================================================== -->
103+
104+
<h3>5. IAB News We Can Use</h3>
105+
106+
<!-- ===================================================================== -->
107+
<!-- SECTION 6 -->
108+
<!-- ===================================================================== -->
109+
110+
{% if not mgmt %}
111+
<h3>6. Management Items</h3>
112+
113+
<p>NONE</p>
114+
{% else %}
115+
{% for m in mgmt %}
116+
<h3>6. Management Items<br>
117+
6.{{forloop.counter}} {{m}}</h3>
118+
119+
<p><b>Is there anything that you would like the Secretariat to record in the minutes for this management issue?</b></p>
120+
121+
<p><i>Decision:</i></p>
122+
123+
<p><i>The management issue was discussed.</i></p>
124+
125+
<p><i>Action Item (if applicable):</i></p>
126+
127+
{% endfor %}
128+
{% endif %}
129+
130+
<!-- ===================================================================== -->
131+
<!-- SECTION 7 -->
132+
<!-- ===================================================================== -->
133+
134+
<h3>7. Working Group News</h3>
135+
136+
<pre>
137+
{% for name in ad_names %}[ ] {{ name }}
138+
{% endfor %}
139+
</pre>
140+
141+
</body></html>

‎ietf/templates/iesg/moderator_wg.html‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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 %}{% load ietf_filters %}
34+
{% for wg in section_wgs %}
35+
<h3>{{ title1 }}<br />
36+
{{ title2 }}<br />
37+
{{ title3 }} ({{ forloop.counter }} of {{ section_wgs|length }})</h3>
38+
39+
<p><b>{{ wg.obj.group_acronym.name }} ({{wg.obj.group_acronym}})<br/>
40+
{% if wg.obj.token_name %}
41+
Token: {{ wg.obj.token_name }}
42+
{% endif %}</b></p>
43+
44+
{% if wg.obj.note %}
45+
<p>Note: {{wg.obj.note|striptags}}</p>
46+
{% endif %}
47+
48+
<p>(text still needs work)</p>
49+
50+
<p><i>If APPROVED - The Secretariat will send...</i></p>
51+
52+
<p><i>If NOT APPROVED - The Secretariat will<br/>
53+
[ &nbsp; ] Place the charter back on the agenda for the next telechat<br/>
54+
[ &nbsp; ] Wait for instructions from the shepherding AD</i></p>
55+
56+
{% empty %}
57+
<h3>{{ title1 }}<br />
58+
{{ title2 }}<br />
59+
{{ title3 }}</h3>
60+
61+
<p>NONE</p>
62+
{% endfor %}

0 commit comments

Comments
 (0)