Skip to content

Commit 966a059

Browse files
pasieronenpasieronen
committed
Updated moderator package texts
 - Legacy-Id: 1890
1 parent ea2f1bd commit 966a059

3 files changed

Lines changed: 146 additions & 46 deletions

File tree

‎ietf/templates/iesg/moderator_doc.html‎

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,48 +45,98 @@ <h3>{{ title1 }}<br>
4545
<b>Intended Status: {{ doc.obj.document.intended_status }}<br>
4646
Token: {{ doc.obj.token_name|escape }}</b></p>
4747

48-
49-
<small>{% filter linebreaks_crlf %}<pre>{% if doc.obj.ballot.active %}
48+
{% if doc.obj.ballot.active %}
49+
{% filter linebreaks_crlf %}<small><pre>
5050
Yes No-Objection Discuss Abstain
5151
{% 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 }}
5252
{% endfor %}
5353
{% 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 }}
54-
{% endif %}{% endfor %}{% else %}(Ballot not issued){% endif %}</pre><{% endfilter %}/small>
55-
56-
{% 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 %}
54+
{% endif %}{% endfor %}</pre></small>{% endfilter %}
5755

56+
{% if title1|startswith:"2." %}
5857
<p>____ open positions<br>
59-
<b>[ &nbsp; ] would you like to record a position?</b></p>
58+
[ &nbsp; ] would you like to record a position?</p>
59+
{% endif %}
6060

6161
<p>____ active discusses<br>
62-
<b>[ &nbsp; ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?</b></p>
62+
[ &nbsp; ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?</p>
6363

64-
{% ifequal title1 "2. Protocol Actions" %}
65-
<p>"Yes" or "No-Objection" positions from 2/3 of non-recused ADs,
66-
with no "Discuss" positions, are needed for approval.</p>
6764
{% else %}
68-
<p>1 "Yes" with no "Discuss" positions are needed for approval.</p>
69-
{% endifequal %}
65+
<p>(Ballot not issued)</p>
66+
{% endif %}
67+
68+
{% 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 %}
69+
70+
{% if title2|startswith:"3.1" or title2|startswith:"3.2" %}
71+
<p>Does anyone have an[y further] objection to this document being published as an {{ doc.obj.document.intended_status }} RFC?</p>
72+
{% endif %}
73+
{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %}
74+
<p>Does anyone have an objection to the RFC Editor publishing this document as an {{ doc.obj.document.intended_status }} RFC?</p>
75+
{% endif %}
76+
{% if title3|startswith:"3.3.3" %}
77+
<p>Who will do the review of this document?</p>
78+
{% endif %}
7079

7180
<p>Current State: {{ doc.obj.cur_state }}, sub state: {{ doc.obj.cur_sub_state|default:"(none)" }}<br>
7281
Next State:<br>
7382
Sub State: </p>
7483

75-
{% if title2|startswith:"3.3" %}
76-
<p>(Text for RFC Editor submissions still missing)</p>
77-
{% else %}
78-
<p><i>If APPROVED - The Secretariat will send
79-
{% if title2|startswith:"2.1" or title2|startswith:"3.1" %}a working group{%else%}an individual{%endif%} submission,
80-
{% if title1|startswith:"2." %}Protocol{%else%}Document{%endif%} Action
81-
Announcement.</i>
82-
83-
<p><i>If APPROVED with caveats - The Secretariat will send
84-
{% if title2|startswith:"2.1" or title2|startswith:"3.1" %}a working group{%else%}an individual{%endif%} submission,
85-
{% if title1|startswith:"2." %}Protocol{%else%}Document{%endif%} Action
86-
Announcement that includes the [RFC
87-
Editor Note, IESG Note, etc.] to be drafted by [Name that AD].</i></p>
84+
{% if title3|startswith:"2.1.1" or title3|startswith:"2.1.2" %}
85+
<p>If APPROVED - The Secretariat will send a working group
86+
submission, Protocol Action Announcement.</p>
87+
88+
<p>If APPROVED with caveats - The Secretariat will send a working
89+
group submission, Protocol Action Announcement that includes the
90+
[RFC Editor Note, IESG Note, etc.] to be drafted by [Name that
91+
AD].</p>
92+
{% endif %}
93+
94+
{% if title3|startswith:"2.2.1" or title3|startswith:"2.2.2" %}
95+
<p>If APPROVED - The Secretariat will send an individual submission,
96+
Protocol Action Announcement.</p>
97+
98+
<p>If APPROVED with caveats - The Secretariat will send an
99+
individual submission, Protocol Action Announcement that includes
100+
the [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that
101+
AD].</p>
102+
{% endif %}
103+
104+
{% if title3|startswith:"3.1.1" or title3|startswith:"3.1.2" %}
105+
<p>If APPROVED - The Secretariat will send a working group submission
106+
Document Action Announcement.</p>
107+
108+
<p>If APPROVED with caveats - The Secretariat will send a working
109+
group submission Document Action announcement that includes the [RFC
110+
Ed. Note, IESG, note, etc.] from [Name that AD].</p>
111+
{% endif %}
112+
113+
{% if title3|startswith:"3.2.1" or title3|startswith:"3.2.2" %}
114+
<p>If APPROVED - The Secretariat will send an individual submission
115+
Document Action Announcement.</p>
116+
117+
<p>If APPROVED with caveats - The Secretariat will send an
118+
individual submission Document Action announcement that includes the
119+
[RFC Ed. Note, IESG, note, etc.] from [Name that AD].</p>
88120
{% endif %}
89121

122+
{% if title3|startswith:"3.3.1" or title3|startswith:"3.3.2" %}
123+
<p>If APPROVED - The Secretariat will send a standard no problem
124+
message to the RFC Editor. [Name of AD] will you supply the text for
125+
the IESG Note?</p>
126+
127+
<p>If APPROVED with caveats - The Secretariat will send a standard
128+
no problem message to the RFC Editor that includes the note drafted
129+
by [Name that AD].</p>
130+
131+
<p>If NOT APPROVED - The Secretariat will send the standard Do Not
132+
Publish message to the RFC Editor.</p>
133+
134+
<p>If NOT APPROVED with clarifications - The Secretariat will send
135+
the Do Not Publish message to the RFC Editor that includes the note
136+
drafted by[Name the AD].</p>
137+
{% endif %}
138+
139+
90140
{% empty %}
91141
<h3>{{ title1 }}<br>
92142
{{ title2 }}<br>

‎ietf/templates/iesg/moderator_package.html‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
{% endcomment %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
3636
{% load ietf_filters %}
3737
<html><head>
38+
<title>Moderator Package for {{date}} IESG Telechat</title>
3839
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3940
<style type="text/css">
4041
h3 { page-break-before:always; }
@@ -62,19 +63,19 @@ <h3>1. Administrivia<br>1.1 Roll Call</h3>
6263

6364
<h3>1. Administrivia<br>1.2 Bash the Agenda</h3>
6465

65-
<p><b>Does anyone want to add anything NEW to the agenda?</b></p>
66+
<p>Does anyone want to add anything NEW to the agenda?</p>
6667

67-
<p><b>Does anyone have any other changes to the agenda as it stands?</b></b>
68+
<p>Does anyone have any other changes to the agenda as it stands?</p>
6869

6970
<h3>1. Administrivia<br>1.3 Approval of the Minutes of Past Telechats</h3>
7071

71-
<p><b>Does anyone have an objection to the minutes of the &lt;DATE&gt; IESG
72-
Teleconference being approved?</b></p>
72+
<p>Does anyone have an objection to the minutes of the __________ IESG
73+
Teleconference being approved?</p>
7374

74-
<p><b>IF APPROVED: The minutes are approved for the &LT;DATE&gt;
75-
teleconference. The Secretariat will post them in the public archive.</b></p>
75+
<p>IF APPROVED: The minutes are approved for the __________
76+
teleconference. The Secretariat will post them in the public archive.</p>
7677

77-
<p><b>Are there narrative minutes to approve for today?</b></p>
78+
<p>Are there narrative minutes to approve for today?</p>
7879

7980
<h3>1. Administrivia<br>1.4 List of Remaining Action Items from Last Telehat</h3>
8081

@@ -112,13 +113,13 @@ <h3>5. IAB News We Can Use</h3>
112113
<h3>6. Management Items<br>
113114
6.{{forloop.counter}} {{m.title}}</h3>
114115

115-
<p><b>Is there anything that you would like the Secretariat to record in the minutes for this management issue?</b></p>
116+
<p>Is there anything that you would like the Secretariat to record in the minutes for this management issue?</p>
116117

117-
<p><i>Decision:</i></p>
118+
<p>Decision:</p>
118119

119-
<p><i>The management issue was discussed.</i></p>
120+
<p>The management issue was discussed.</p>
120121

121-
<p><i>Action Item (if applicable):</i></p>
122+
<p>Action Item (if applicable):</p>
122123

123124
{% empty %}
124125
<h3>6. Management Items</h3>

‎ietf/templates/iesg/moderator_wg.html‎

Lines changed: 59 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
{% endcomment %}{% load ietf_filters %}
3434
{% for wg in section_wgs %}
35-
<h3>{{ title1 }}<br />
36-
{{ title2 }}<br />
35+
<h3>{{ title1 }}<br>
36+
{{ title2 }}<br>
3737
{{ title3 }} ({{ forloop.counter }} of {{ section_wgs|length }})</h3>
3838

39-
<p><b>{{ wg.obj.group_acronym.name }} ({{wg.obj.group_acronym}})<br/>
39+
<p><b>{{ wg.obj.group_acronym.name }} ({{wg.obj.group_acronym}})<br>
4040
{% if wg.obj.token_name %}
4141
Token: {{ wg.obj.token_name }}
4242
{% endif %}</b></p>
@@ -45,17 +45,66 @@ <h3>{{ title1 }}<br />
4545
<p>Note: {{wg.obj.note|striptags}}</p>
4646
{% endif %}
4747

48-
<p>(text still needs work)</p>
48+
{% if title3|startswith:"4.1.1" %}
49+
<p>Does anyone have an objection to the charter being sent for
50+
EXTERNAL REVIEW?</p>
4951

50-
<p><i>If APPROVED - The Secretariat will send...</i></p>
52+
<p>If External Review APPROVED - The Secretariat will send a Working
53+
Group Review Announcement with a separate message to new-work and
54+
place it back on the agenda for the next telechat.</p>
5155

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>
56+
<p>If NOT APPROVED - The Secretariat will<br>
57+
* wait for instruction from [Name the AD].<br>
58+
* OR Back to Internal Review.<br>
59+
* OR Back on the Agenda next time in the same category.</p>
60+
{% endif %}
61+
62+
{% if title3|startswith:"4.1.2" %}
63+
<p>Does anyone have an objection to the creation of this working
64+
group?</p>
65+
66+
<p>IF APPROVED - The Secretariat will send a Working Group Action
67+
announcement.</p>
68+
69+
<p>If NOT APPROVED - The Secretariat will<br>
70+
* Place the charter back on the agenda for the next telechat.<br>
71+
* OR Wait for instructions from the shepherding AD.</p>
72+
{% endif %}
73+
74+
{% if title3|startswith:"4.2.1" %}
75+
<p>Does anyone have an objection with just making the changes to the
76+
charter?</p>
77+
78+
<p>If NO OBJECTION - The Secretariat will send a Working Group
79+
Action: RECHARTER Announcement.</p>
80+
81+
<p>If MUST GO FOR EXTERNAL REVIEW - The Secretariat will send a
82+
Working Group Review: Recharter Announcement with messages to
83+
new-work and the WG Chairs. The Secretariat will place it back on
84+
the agenda for the next telechat.</p>
85+
86+
<p>If OBJECTION - IESG decides not to move forward with the
87+
rechartering of the working group: The Secretariat will await
88+
further instructions regarding the charter of [insert working group
89+
acronym].</p>
90+
{% endif %}
91+
92+
{% if title3|startswith:"4.2.2" %}
93+
94+
<p>Does anyone have an objection to the rechartering of this working
95+
group?</p>
96+
97+
<p>IF APPROVED - The Secretariat will send a Working Group Action:
98+
RECHARTER announcement.</p>
99+
100+
<p>If NOT APPROVED - The Secretariat will<br>
101+
* Place the charter back on the agenda for the next telechat.<br>
102+
* OR Wait for instructions from the shepherding AD.</p>
103+
{% endif %}
55104

56105
{% empty %}
57-
<h3>{{ title1 }}<br />
58-
{{ title2 }}<br />
106+
<h3>{{ title1 }}<br>
107+
{{ title2 }}<br>
59108
{{ title3 }}</h3>
60109

61110
<p>NONE</p>

0 commit comments

Comments
 (0)