From db9f5886d7f2c0232d9684dcb8f505747c7ba06e Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 6 Nov 2010 08:46:30 +0000
Subject: [PATCH] Merged [2607] from lars.eggert@nokia.com: This commit fixes
 tickets #526 and #530. Specifically, it changes the format of the
 notification email sent out when an AD posts a ballot position on a draft, it
 by default CCs that email to the authors and chairs, and adds some
 explanatory text to the body of those messages.  - Legacy-Id: 2624 Note: SVN
 reference [2607] has been migrated to Git commit
 e1134da629dbe5a9b85cad5608e50e03fbbae797

---
 ietf/idrfc/views_ballot.py                    |  8 ++++---
 ietf/templates/idrfc/ballot_comment_mail.txt  | 22 +++++++++++++++++--
 ietf/templates/idrfc/send_ballot_comment.html |  6 ++---
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ietf/idrfc/views_ballot.py b/ietf/idrfc/views_ballot.py
index 2112530b9..912ca463f 100644
--- a/ietf/idrfc/views_ballot.py
+++ b/ietf/idrfc/views_ballot.py
@@ -228,11 +228,13 @@ def send_ballot_comment(request, name):
         c = comment.text
         subj.append("COMMENT")
 
-    subject = "%s: %s" % (" and ".join(subj), doc.file_tag())
+    ad_name = str(ad)
+    ad_name_genitive = ad_name + "'" if ad_name.endswith('s') else ad_name + "'s"
+    subject = "%s %s on %s" % (ad_name_genitive, " and ".join(subj), doc.filename + '-' + doc.revision_display())
     body = render_to_string("idrfc/ballot_comment_mail.txt",
-                            dict(discuss=d, comment=c))
+                            dict(discuss=d, comment=c, ad=ad, doc=doc))
     frm = u"%s <%s>" % ad.person.email()
-    to = "iesg@ietf.org"
+    to = "The IESG <iesg@ietf.org>"
         
     if request.method == 'POST':
         cc = [x.strip() for x in request.POST.get("cc", "").split(',') if x.strip()]
diff --git a/ietf/templates/idrfc/ballot_comment_mail.txt b/ietf/templates/idrfc/ballot_comment_mail.txt
index 2cdf676c4..b4a15841f 100644
--- a/ietf/templates/idrfc/ballot_comment_mail.txt
+++ b/ietf/templates/idrfc/ballot_comment_mail.txt
@@ -1,6 +1,24 @@
-{% if discuss %}Discuss:
+{{ ad }} has entered the following ballot position for
+{{ doc.filename }}-{{ doc.revision_display }}.
+
+When responding, please keep the subject line intact and reply to all
+email addresses included in the To and CC lines. (Feel free to cut this
+introductory paragraph, however.)
+
+Please refer to http://www.ietf.org/iesg/statement/discuss-criteria.html
+for more information about IESG DISCUSS and COMMENT positions.
+
+
+{% if discuss %}----------------------------------------------------------------------
+DISCUSS:
+----------------------------------------------------------------------
+
 {{ discuss|safe }}
 
-{% endif %}{% if comment %}Comment:
+
+{% endif %}{% if comment %}----------------------------------------------------------------------
+COMMENT:
+----------------------------------------------------------------------
+
 {{ comment|safe }}
 {% endif %}
diff --git a/ietf/templates/idrfc/send_ballot_comment.html b/ietf/templates/idrfc/send_ballot_comment.html
index 7e973bba9..c9b2312e0 100644
--- a/ietf/templates/idrfc/send_ballot_comment.html
+++ b/ietf/templates/idrfc/send_ballot_comment.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Email Discuss and Comment text for {{ ad }} to IESG list{% endblock %}
+{% block title %}Send ballot position email for {{ ad }}{% endblock %}
 
 {% block morecss %}
 form.send-ballot pre {
@@ -12,7 +12,7 @@ form.send-ballot pre {
 {% endblock %}
 
 {% block content %}
-<h1>Email Discuss and Comment text for {{ ad }} to IESG list</h1>
+<h1>Send ballot position email for {{ ad }}</h1>
 
 <form class="send-ballot" action="" method="POST">
   <table>
@@ -24,7 +24,7 @@ form.send-ballot pre {
       <td><input type="text" name="cc" value="" size="75" /><br/>
       {% if doc.idinternal.state_change_notice_to %}
       <label>
-        <input type="checkbox" name="cc_state_change" value="1" />
+        <input type="checkbox" name="cc_state_change" value="1" checked="yes" />
         {{ doc.idinternal.state_change_notice_to }}
       </label>
       {% endif %}