Skip to content

Commit 7997b99

Browse files
larseggertlarseggert
committed
More fixes to charter-related emails and some related web templates. Mostly
focused on supporting the IRTF better, but also removing some redundancies (i.e., including group_info.txt instead of duplicating something similar.) Commit ready for merge. - Legacy-Id: 10674
1 parent bcea973 commit 7997b99

6 files changed

Lines changed: 16 additions & 33 deletions

File tree

‎ietf/doc/mails.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,11 +470,13 @@ def email_charter_internal_review(request, charter):
470470
'Internal %s Review: %s (%s)'%(charter.group.type.name,charter.group.name,charter.group.acronym),
471471
'doc/mail/charter_internal_review.txt',
472472
dict(charter=charter,
473-
chairs=charter.group.role_set.filter(name='chair').values_list('person__name',flat=True),
474-
ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True),
475473
charter_text=charter_text,
476-
milestones=charter.group.groupmilestone_set.filter(state="charter"),
477474
review_type = "new" if charter.group.state_id == "proposed" else "recharter",
475+
charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
476+
chairs=charter.group.role_set.filter(name="chair"),
477+
secr=charter.group.role_set.filter(name="secr"),
478+
techadv=charter.group.role_set.filter(name="techadv"),
479+
milestones=charter.group.groupmilestone_set.filter(state="charter"),
478480
),
479481
cc=addrs.cc,
480482
extra={'Reply-To':"iesg@ietf.org"},

‎ietf/templates/doc/charter/action_announcement_text.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
{% load bootstrap3 %}
66
{% load ietf_filters %}
77

8-
{% block title %}WG Action announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
8+
{% block title %}{{ charter.chartered_group.type.name }} action announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
99

1010
{% block content %}
1111
{% origin %}
12-
<h1>WG Action announcement writeup<br><small>{{ charter.chartered_group.acronym }}</small></h1>
12+
<h1>{{ charter.chartered_group.type.name }} action announcement writeup<br><small>{{ charter.chartered_group.acronym }}</small></h1>
1313

1414
{% bootstrap_messages %}
1515

‎ietf/templates/doc/charter/action_text.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: {{ to }}{% if cc %}
33
Cc: {{ cc }} {% endif %}
4-
Subject: WG Action: {{ action_type }} {{ group.name }} ({{ group.acronym }})
4+
Subject: {{ group.type.name }} Action: {{ action_type }} {{ group.name }} ({{ group.acronym }})
55

6-
{% filter wordwrap:73 %}{% if action_type == "Formed" %}A new IETF working group has been formed in the {{ group.parent.name }}.{% endif %}{% if action_type == "Rechartered" %}The {{ group.name }} ({{ group.acronym }}) working group in the {{ group.parent.name }} of the IETF has been rechartered.{% endif %} For additional information please contact the Area Directors or the {{ group.type.name }} Chair{{ chairs|pluralize}}.
6+
{% filter wordwrap:73 %}{% if action_type == "Formed" %}A new {% if group.type_id == "rg" %}IRTF{% else %}IETF{% endif %} {{ group.type.name }} has been formed in the {{ group.parent.name }}.{% endif %}{% if action_type == "Rechartered" %}The {{ group.name }} ({{ group.acronym }}) {{ group.type.name }} in the {{ group.parent.name }} of the {% if group.type_id == "rg" %}IRTF{% else %}IETF{% endif %} has been rechartered.{% endif %} For additional information, please contact the {% if group.type_id == "rg" %}IRTF Chair, the Internet Research Steering Group{% else %}Area Directors{% endif %} or the {{ group.type.name }} Chair{{ chairs|pluralize}}.
77

88
{% include "doc/charter/group_info.txt" %}{% endfilter %}{% endautoescape %}

‎ietf/templates/doc/charter/group_info.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{ group.name }} ({{ group.acronym }})
2-
------------------------------------------------
3-
Current Status: {{ group.state.name }} {{ group.type.name }}
2+
-----------------------------------------------------------------------
3+
Current status: {{ group.state.name }} {{ group.type.name }}
44

55
{% if chairs %}Chairs:
66
{% for r in chairs %} {{ r.person.plain_name }} <{{r.email.address}}>
@@ -16,10 +16,10 @@ Current Status: {{ group.state.name }} {{ group.type.name }}
1616

1717
{% endif %}{% if group.list_email %}Mailing list
1818
Address: {{ group.list_email }}
19-
To Subscribe: {{ group.list_subscribe }}
19+
To subscribe: {{ group.list_subscribe }}
2020
Archive: {{ group.list_archive }}
2121
{% endif %}
22-
Charter:
22+
Charter: {{ charter_url }}
2323

2424
{{ charter_text }}
2525

‎ietf/templates/doc/charter/review_text.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: {{ to }}{% if cc %}
33
Cc: {{ cc }} {% endif %}
4-
Subject: WG Review: {{ group.name }} ({{ group.acronym }})
4+
Subject: {{ group.type.name }} Review: {{ group.name }} ({{ group.acronym }})
55

6-
{% filter wordwrap:73 %}{% if review_type == "new" %}A new IETF working group has been proposed in the {{ group.parent.name }}.{% endif %}{% if review_type == "recharter" %}The {{ group.name }} ({{group.acronym}}) working group in the {{ group.parent.name }} of the IETF is undergoing rechartering.{% endif %} The IESG has not made any determination yet. The following draft charter was submitted, and is provided for informational purposes only. Please send your comments to the IESG mailing list (iesg at ietf.org) by {{ review_date }}.
6+
{% filter wordwrap:73 %}{% if review_type == "new" %}A new {% if group.type_id == "rg" %}IRTF{% else %}IETF{% endif %} {{ group.type.name }} has been proposed in the {{ group.parent.name }}.{% elif review_type == "recharter" %}The {{ group.name }} ({{group.acronym}}) {{ group.type.name }} in the {{ group.parent.name }} of the {% if group.type_id == "rg" %}IRTF{% else %}IETF{% endif %} is undergoing rechartering.{% endif %} The {% if group.type_id == "rg" %}IRSG{% else %}IESG{% endif %} has not made any determination yet. The following draft charter was submitted, and is provided for informational purposes only. Please send your comments to the {% if group.type_id == "rg" %}IRSG{% else %}IESG{% endif %} mailing list ({% if group.type_id == "rg" %}irsg@irtf.org{% else %}iesg@ietf.org{% endif %} by {{ review_date }}.
77

88
{% include "doc/charter/group_info.txt" %}{% endfilter %}{% endautoescape %}

‎ietf/templates/doc/mail/charter_internal_review.txt‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,4 @@ Review time is one week.
66

77
The IETF Secretariat
88

9-
{{charter.group.name}} ({{ charter.group.acronym }})
10-
--------------------------------------------------
11-
Current Status: {{ charter.group.state.name }} {{ charter.group.type.name }}
12-
13-
Chairs: {{ chairs|join:', '|default:'TBD' }}
14-
{% if charter.group.type_id != "rg" %}
15-
Area Director: {{ ads|join:', '|default:'TBD' }}
16-
{% endif %}
17-
Mailing List: {{ charter.group.list_email|default:'TBD' }}
18-
19-
{{ charter.name }}-{{ charter.rev }}
20-
21-
{{ charter_text }}
22-
23-
Proposed milestones
24-
25-
{%if milestones %}{% for milestone in milestones reversed %}{{ milestone.due|date:"M Y" }} {{ milestone.desc }}
26-
{% endfor %}{% else %}TBD{% endif %}
27-
28-
{% endfilter %}{% endautoescape%}
9+
{% include "doc/charter/group_info.txt" with group=charter.group%}{% endfilter %}{% endautoescape %}

0 commit comments

Comments
 (0)