altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

More fixes to charter-related emails and some related web templates. Mostly

Browse source 
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
This commit is contained in:
Lars Eggert 2016-01-13 14:53:47 +00:00
parent bcea97323f
commit 7997b99f02
6 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ietf/doc/mails.py
View file

@ -470,11 +470,13 @@ def email_charter_internal_review(request, charter):
'Internal %s Review: %s (%s)'%(charter.group.type.name,charter.group.name,charter.group.acronym),
'doc/mail/charter_internal_review.txt',
dict(charter=charter,
chairs=charter.group.role_set.filter(name='chair').values_list('person__name',flat=True),
ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True),
charter_text=charter_text,
milestones=charter.group.groupmilestone_set.filter(state="charter"),
review_type = "new" if charter.group.state_id == "proposed" else "recharter",
charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
chairs=charter.group.role_set.filter(name="chair"),
secr=charter.group.role_set.filter(name="secr"),
techadv=charter.group.role_set.filter(name="techadv"),
milestones=charter.group.groupmilestone_set.filter(state="charter"),
),
cc=addrs.cc,
extra={'Reply-To':"iesg@ietf.org"},

4
ietf/templates/doc/charter/action_announcement_text.html
View file

@ -5,11 +5,11 @@
{% load bootstrap3 %}
{% load ietf_filters %}
{% block title %}WG Action announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
{% block title %}{{ charter.chartered_group.type.name }} action announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
{% block content %}
{% origin %}
<h1>WG Action announcement writeup<br><small>{{ charter.chartered_group.acronym }}</small></h1>
<h1>{{ charter.chartered_group.type.name }} action announcement writeup<br><small>{{ charter.chartered_group.acronym }}</small></h1>
{% bootstrap_messages %}

4
ietf/templates/doc/charter/action_text.txt
View file

@ -1,8 +1,8 @@
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
To: {{ to }}{% if cc %}
Cc: {{ cc }} {% endif %}
Subject: WG Action: {{ action_type }} {{ group.name }} ({{ group.acronym }})
Subject: {{ group.type.name }} Action: {{ action_type }} {{ group.name }} ({{ group.acronym }})
{% 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}}.
{% 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}}.
{% include "doc/charter/group_info.txt" %}{% endfilter %}{% endautoescape %}

8
ietf/templates/doc/charter/group_info.txt
View file

@ -1,6 +1,6 @@
{{ group.name }} ({{ group.acronym }})
------------------------------------------------
Current Status: {{ group.state.name }} {{ group.type.name }}
-----------------------------------------------------------------------
Current status: {{ group.state.name }} {{ group.type.name }}
{% if chairs %}Chairs:
{% for r in chairs %} {{ r.person.plain_name }} <{{r.email.address}}>
@ -16,10 +16,10 @@ Current Status: {{ group.state.name }} {{ group.type.name }}
{% endif %}{% if group.list_email %}Mailing list
Address: {{ group.list_email }}
To Subscribe: {{ group.list_subscribe }}
To subscribe: {{ group.list_subscribe }}
Archive: {{ group.list_archive }}
{% endif %}
Charter:
Charter: {{ charter_url }}
{{ charter_text }}

4
ietf/templates/doc/charter/review_text.txt
View file

@ -1,8 +1,8 @@
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
To: {{ to }}{% if cc %}
Cc: {{ cc }} {% endif %}
Subject: WG Review: {{ group.name }} ({{ group.acronym }})
Subject: {{ group.type.name }} Review: {{ group.name }} ({{ group.acronym }})
{% 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 }}.
{% 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 }}.
{% include "doc/charter/group_info.txt" %}{% endfilter %}{% endautoescape %}

21
ietf/templates/doc/mail/charter_internal_review.txt
View file

@ -6,23 +6,4 @@ Review time is one week.
The IETF Secretariat
{{charter.group.name}} ({{ charter.group.acronym }})
--------------------------------------------------
Current Status: {{ charter.group.state.name }} {{ charter.group.type.name }}
Chairs: {{ chairs|join:', '|default:'TBD' }}
{% if charter.group.type_id != "rg" %}
Area Director: {{ ads|join:', '|default:'TBD' }}
{% endif %}
Mailing List: {{ charter.group.list_email|default:'TBD' }}
{{ charter.name }}-{{ charter.rev }}
{{ charter_text }}
Proposed milestones
{%if milestones %}{% for milestone in milestones reversed %}{{ milestone.due|date:"M Y" }} {{ milestone.desc }}
{% endfor %}{% else %}TBD{% endif %}
{% endfilter %}{% endautoescape%}
{% include "doc/charter/group_info.txt" with group=charter.group%}{% endfilter %}{% endautoescape %}