From b6978debb6c8fc6eb787efaef41aea8cada99009 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 24 Aug 2016 18:43:15 +0000
Subject: [PATCH] Put WG summary information on the rechartering page. Fixes
 #2000. Commit ready for merge.  - Legacy-Id: 11859

---
 ietf/doc/views_charter.py              |  2 +
 ietf/templates/doc/charter/submit.html | 70 +++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py
index 251324a77..e6cb06a59 100644
--- a/ietf/doc/views_charter.py
+++ b/ietf/doc/views_charter.py
@@ -31,6 +31,7 @@ from ietf.utils.history import find_history_active_at
 from ietf.utils.mail import send_mail_preformatted 
 from ietf.utils.textupload import get_cleaned_text_file_content
 from ietf.group.mails import email_admin_re_charter
+from ietf.group.views import fill_in_charter_info
 
 class ChangeStateForm(forms.Form):
     charter_state = forms.ModelChoiceField(State.objects.filter(used=True, type="charter"), label="Charter state", empty_label=None, required=False)
@@ -421,6 +422,7 @@ def submit(request, name=None, option=None):
         except IOError:
             pass
         form = UploadForm(initial=init)
+        fill_in_charter_info(group)
     return render_to_response('doc/charter/submit.html',
                               {'form': form,
                                'next_rev': next_rev,
diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html
index 019b49412..a52903dfb 100644
--- a/ietf/templates/doc/charter/submit.html
+++ b/ietf/templates/doc/charter/submit.html
@@ -10,7 +10,75 @@
 
 {% block content %}
   {% origin %}
-  <h1>Charter submission<br><small>{{ group.acronym }} {{ group.type.name }}</small></h1>
+  <h1>Charter submission</h1>
+
+  <table class="table table-condensed">
+    <tbody class="meta">
+      <tr>
+        <th>{{ group.type.name }}</th>
+        <th>Name</th>
+        <td>{{ group.name }}</td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <th>Acronym</th>
+        <td>{{ group.acronym }}</td>
+      </tr>
+
+      <tr>
+        <td></td>
+        {% if group.parent and group.parent.type_id == "area" %}
+          <th>{{ group.parent.type.name }}</th>
+          <td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
+        {% else %}
+          <th></th><td></td>
+        {% endif %}
+      </tr>
+      <tr>
+        <td></td>
+        <th>State</th>
+        <td>
+          {{ group.state.name }}
+          {% if requested_close %}
+            <div class="label label-info">In the process of being closed</div>
+          {% endif %}
+        </td>
+      </tr>
+    </tbody>
+    <tbody class="meta">
+      {% for slug, label, roles in group.personnel %}
+        <tr>
+          {% if forloop.first %}
+            <th>Personnel</th>
+          {% else %}
+            <td></td>
+          {% endif %}
+          <th>{{ label }}</th>
+          <td>
+  
+  
+            {% for r in roles %}
+              <span class="fa fa-envelope-o"></span>
+              <a href="mailto:{{ r.email.address }}">{{ r.person.plain_name }}</a>
+              <br>
+            {% endfor %}
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  
+    {% if group.list_email %}
+    <tbody class="meta">
+      <tr>
+         <th>Mailing list</th>
+         <th>Address</th><td>{{ group.list_email|urlize }}</td>
+      </tr>
+      <tr><td></td><th>To subscribe</th><td>{{ group.list_subscribe|urlize }}</td></tr>
+      <tr><td></td><th>Archive</th><td>{{ group.list_archive|urlize }}</td></tr>
+    </tbody>
+    {% endif %}
+  </table>
 
   <p class="alert alert-info">The text will be submitted as <b>charter-ietf-{{ name }}-{{ next_rev }}</b>.</p>