Skip to content

Commit 95f3223

Browse files
author
Martin Qvist
committed
Committing changes from yesterday (updates based on feedback)
 - Legacy-Id: 3430
1 parent f025993 commit 95f3223

56 files changed

Lines changed: 4511 additions & 0 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ietf/templates/wgcharter/action_text.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
2+
To: IETF-Announce <ietf-announce@ietf.org>
3+
Subject: WG Action: {{ action_type }} {{ wg.name }} ({{wg.acronym}})
4+
5+
{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{wg.acronym}}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair.
6+
7+
{% include "wgcharter/wg_info.txt" %}
8+
9+
{% endfilter %}
10+
{% endautoescape %}

‎ietf/templates/wgcharter/add_comment.html‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{% extends "base.html" %}
2+
{% comment %}
3+
Copyright The IETF Trust 2011, All Rights Reserved
4+
{% endcomment %}
5+
6+
{% block title %}Add comment on {{ wg.acronym }}{% endblock %}
7+
8+
{% block morecss %}
9+
form.add-comment #id_comment {
10+
width: 600px;
11+
height: 300px;
12+
}
13+
14+
form.add-comment .actions {
15+
padding-top: 20px;
16+
}
17+
{% endblock %}
18+
19+
{% block content %}
20+
<h1>Add comment on {{ wg.acronym }}</h1>
21+
22+
<p>The comment will be added to the history trail.</p>
23+
24+
<form class="add-comment" action="" method="POST">
25+
<table>
26+
{{ form.as_table }}
27+
<tr>
28+
<td></td>
29+
<td class="actions">
30+
<a href="{% url wg_view name=wg.acronym %}">Back</a>
31+
<input type="submit" value="Add comment"/>
32+
</td>
33+
</tr>
34+
</table>
35+
</form>
36+
{% endblock %}

‎ietf/templates/wgcharter/announcement_text.html‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
4+
5+
{% block morecss %}
6+
form #id_announcement_text {
7+
width: 700px;
8+
height: 600px;
9+
}
10+
{% endblock %}
11+
12+
{% block content %}
13+
<h1>WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}</h1>
14+
15+
<form action="" method="POST">
16+
17+
{{ announcement_text_form.announcement_text }}
18+
19+
<div class="actions">
20+
<a href="{{ back_url }}">Back</a>
21+
<input type="submit" name="save_text" value="Save WG {{ announcement }} announcement text" />
22+
<input type="submit" name="regenerate_text" value="Regenerate {{ announcement }} text" />
23+
</div>
24+
25+
{% load ietf_filters %}
26+
{% if user|in_group:"Secretariat" %}
27+
<div class="actions">
28+
<input type="submit" name="send_text" value="Send WG {{ announcement }} announcement" />
29+
</div>
30+
{% endif %}
31+
32+
</form>
33+
34+
{% endblock%}

‎ietf/templates/wgcharter/approve_ballot.html‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}Approve ballot for {{ wg.acronym }}{% endblock %}
4+
5+
{% block morecss %}
6+
form.approve-ballot pre {
7+
margin: 0;
8+
padding: 4px;
9+
border-top: 4px solid #eee;
10+
border-bottom: 4px solid #eee;
11+
}
12+
form.approve-ballot .announcement {
13+
overflow-x: auto;
14+
overflow-y: scroll;
15+
width: 800px;
16+
height: 400px;
17+
border: 1px solid #bbb;
18+
}
19+
{% endblock %}
20+
21+
{% block content %}
22+
<h1>Approve Ballot for {{ wg.acronym }}</h1>
23+
24+
<div>IETF announcement:</div>
25+
26+
<form class="approve-ballot" action="" method="POST">
27+
28+
<div class="announcement">
29+
<pre>{{ announcement }}</pre>
30+
</div>
31+
32+
<div class="actions">
33+
<a href="{% url wg_view name=wg.acronym %}">Back</a>
34+
<input type="submit" value="Send out the announcement, close ballot and update revision"/>
35+
</div>
36+
</form>
37+
{% endblock %}

‎ietf/templates/wgcharter/ballot_comment_mail.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{% autoescape off %}{{ ad }} has entered the following ballot position for
2+
{{ charter.name }}-{{ charter.rev }}: {{ pos.name }}
3+
4+
When responding, please keep the subject line intact and reply to all
5+
email addresses included in the To and CC lines. (Feel free to cut this
6+
introductory paragraph, however.)
7+
8+
{% if not block_comment and not comment %}
9+
There is no BLOCK or COMMENT text associated with this position.
10+
{% endif %}
11+
12+
{% if block_comment %}----------------------------------------------------------------------
13+
BLOCK:
14+
----------------------------------------------------------------------
15+
16+
{{ block_comment|safe|wordwrap:73 }}
17+
18+
19+
{% endif %}{% if comment %}----------------------------------------------------------------------
20+
COMMENT:
21+
----------------------------------------------------------------------
22+
23+
{{ comment|safe|wordwrap:73 }}
24+
{% endif %}
25+
{% endautoescape %}

‎ietf/templates/wgcharter/ballot_issued.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}Ballot for {{ charter.chartered_group }} issued{% endblock %}
4+
5+
{% block content %}
6+
<h1>Ballot for {{ charter.chartered_group }} issued</h1>
7+
8+
<p>Ballot has been sent out.</p>
9+
10+
<div class="actions">
11+
<a href="{{ back_url }}">Back to WG</a>
12+
</div>
13+
{% endblock %}

‎ietf/templates/wgcharter/ballot_writeup.txt‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
Technical Summary
3+
4+
Relevant content can frequently be found in the abstract
5+
and/or introduction of the document. If not, this may be
6+
an indication that there are deficiencies in the abstract
7+
or introduction.
8+
9+
Working Group Summary
10+
11+
Was there anything in the WG process that is worth noting?
12+
For example, was there controversy about particular points
13+
or were there decisions where the consensus was
14+
particularly rough?
15+
16+
Document Quality
17+
18+
Are there existing implementations of the protocol? Have a
19+
significant number of vendors indicated their plan to
20+
implement the specification? Are there any reviewers that
21+
merit special mention as having done a thorough review,
22+
e.g., one that resulted in important changes or a
23+
conclusion that the document had no substantive issues? If
24+
there was a MIB Doctor, Media Type, or other Expert Review,
25+
what was its course (briefly)? In the case of a Media Type
26+
Review, on what date was the request posted?
27+
28+
Personnel
29+
30+
Who is the Document Shepherd for this document? Who is the
31+
Responsible Area Director? If the document requires IANA
32+
experts(s), insert 'The IANA Expert(s) for the registries
33+
in this document are <TO BE ADDED BY THE AD>.'
34+
35+
RFC Editor Note
36+
37+
(Insert RFC Editor Note here or remove section)
38+
39+
IRTF Note
40+
41+
(Insert IRTF Note here or remove section)
42+
43+
IESG Note
44+
45+
(Insert IESG Note here or remove section)
46+
47+
IANA Note
48+
49+
(Insert IANA Note here or remove section)
50+
51+

‎ietf/templates/wgcharter/ballot_writeupnotes.html‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}Ballot writeup and notes for {{ charter.chartered_group }}{% endblock %}
4+
5+
{% block morecss %}
6+
form #id_ballot_writeup {
7+
width: 700px;
8+
height: 600px;
9+
}
10+
{% endblock %}
11+
12+
{% block content %}
13+
<h1>Ballot writeup and notes for {{ charter.chartered_group }}</h1>
14+
15+
16+
<form action="" method="POST">
17+
18+
<p>(Working Group Summary, Personnel, IAB Note, IESG Note, IANA Note)</p>
19+
20+
{{ ballot_writeup_form.ballot_writeup }}
21+
22+
<div class="actions">
23+
<a href="{{ charter.get_absolute_url }}">Back</a>
24+
<input type="submit" name="save_ballot_writeup" value="Save Ballot Writeup" />
25+
<input style="margin-left: 8px" type="submit" name="issue_ballot" value="Save and {% if reissue %}Re-{% endif %}Issue Ballot" />
26+
</div>
27+
</form>
28+
29+
30+
{% endblock%}

‎ietf/templates/wgcharter/by_area.html‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{% extends "base.html" %}
2+
{% comment %}
3+
Copyright The IETF Trust 2011, All Rights Reserved
4+
{% endcomment %}
5+
6+
{% block title %}Working Groups for {{ area_name }}{% endblock %}
7+
8+
{% block content %}
9+
<h1>Working Groups for {{ area_name }}</h1>
10+
11+
<p>
12+
<span id="create_wg" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="/wgcharter/create/">Create WG</a></span></span>
13+
</p>
14+
15+
{% if not recs %}
16+
<p><b>No WGs match your query.</b></p>
17+
{% else %}
18+
<table class="ietf-table ietf-doctable">
19+
<tr>
20+
{% for hdr in meta.hdrs %}
21+
{% include "wgcharter/table_header.html" %}
22+
{% endfor %}
23+
</tr>
24+
{% for wg in recs %}
25+
{% include "wgcharter/search_result_row.html" %}
26+
{% endfor %}
27+
</table>
28+
{% endif %}
29+
{% endblock content %}

‎ietf/templates/wgcharter/change_state.html‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{% extends "base.html" %}
2+
3+
{% block title %}
4+
{% ifequal option "initcharter" %}
5+
Initiate chartering of WG {{ wg.acronym }}
6+
{% else %}
7+
{% ifequal option "recharter" %}
8+
Recharter WG {{ wg.acronym }}
9+
{% else %}
10+
{% ifequal option "abandon" %}
11+
Abandon effort on WG {{ wg.acronym }}
12+
{% else %}
13+
Change state of WG {{ wg.acronym }}
14+
{% endifequal %}
15+
{% endifequal %}
16+
{% endifequal %}
17+
{% endblock %}
18+
19+
{% block morecss %}
20+
form.change-state select {
21+
width: 22em;
22+
}
23+
24+
#id_message, #id_comment {
25+
width: 40em;
26+
}
27+
28+
form.change-state .actions {
29+
text-align: right;
30+
padding-top: 10px;
31+
}
32+
33+
{% endblock %}
34+
35+
{% block content %}
36+
<h1>{% ifequal option "initcharter" %}
37+
Initiate chartering of WG {{ wg.acronym }}
38+
{% else %}
39+
{% ifequal option "recharter" %}
40+
Recharter WG {{ wg.acronym }}
41+
{% else %}
42+
{% ifequal option "abandon" %}
43+
Abandon effort on WG {{ wg.acronym }}
44+
{% else %}
45+
Change state of WG {{ wg.acronym }}
46+
{% endifequal %}
47+
{% endifequal %}
48+
{% endifequal %}
49+
</h1>
50+
51+
{% ifnotequal option "initcharter" %}{% ifnotequal option "recharter" %}{% ifnotequal option "abandon" %}<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>{% endifnotequal %}{% endifnotequal %}{% endifnotequal %}
52+
53+
<form class="change-state" action="" method="post">
54+
<table>
55+
{% for field in form.visible_fields %}
56+
<tr>
57+
{% ifequal field.name "initial_time" %}
58+
{% ifequal option "recharter" %}
59+
<th>{{ field.label_tag }}:</th>
60+
<td>{{ field }}
61+
{% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
62+
{% else %}
63+
{% ifequal option "initcharter" %}
64+
<th>{{ field.label_tag }}:</th>
65+
<td>{{ field }}
66+
{% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
67+
{% endifequal %}
68+
{% endifequal %}
69+
{% else %}
70+
<th>{{ field.label_tag }}:</th>
71+
<td>{{ field }}
72+
{% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
73+
{% endifequal %}
74+
{% ifequal field.name "charter_state" %}
75+
{% ifequal field.errors "warning" %}
76+
<ul><li>The initial review time hasn't elapsed. Select this checkbox to proceed anyway: <label><input type="checkbox" name="confirm_state" /></label></li></ul>
77+
{% endifequal %}
78+
{% endifequal %}
79+
{% ifnotequal field.name "charter_state" %}
80+
{{ field.errors }}
81+
{% endifnotequal %}
82+
</td>
83+
</tr>
84+
{% endfor %}
85+
<tr>
86+
<td colspan="2" class="actions">
87+
{% if option %}
88+
<input type="submit" value="Submit"/>
89+
{% else %}
90+
<a href="{% url wg_view name=wg.acronym %}">Back</a>
91+
<input type="submit" value="Save"/>
92+
{% endif %}
93+
</td>
94+
</tr>
95+
</table>
96+
</form>
97+
98+
{% if prev_state %}
99+
<h3>Or revert to previous state</h3>
100+
101+
<div class="prev-state">
102+
<form action="" method="post">
103+
<input type="hidden" name="charter_state" value="{{ prev_charter_state.slug }}" />
104+
<input type="hidden" name="state" value="{{ prev_state.slug }}" />
105+
<input type="submit" value="Back to {{ prev_charter_state.name }}" />
106+
</form>
107+
</div>
108+
{% endif %}
109+
{% endblock %}
110+
111+
{% block content_end %}
112+
<script type="text/javascript">
113+
var message = {
114+
"infrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to Informal IESG review by {{ login.name }}",
115+
"intrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to Internal review by {{ login.name }}. Please place it on the next IESG telechat and inform the IAB.",
116+
"extrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to External review by {{ login.name }}. Please send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: "
117+
};
118+
119+
</script>
120+
<script type="text/javascript" src="/js/wg-change-state.js"></script>
121+
{% endblock %}

0 commit comments

Comments
 (0)