Port wginfo/ to new schema, delete some dead code. Missing tests and

still a little bit of cruft left from views in other modules.
 - Legacy-Id: 6084

Author: OleLaursen

ietf/templates/doc/document_charter.html

@@ -25,7 +25,7 @@
     {% if snapshot %}Snapshot of{% endif %}
     {% if doc.get_state_slug != "approved" %}Proposed{% endif %}
     Charter for "{{ group.name }}"
-    (<a {% if group.type.slug == "wg" %}href="{% url ietf.wginfo.views.wg_charter acronym=group.acronym %}"{% endif %}>{{ group.acronym }}</a>) {{ group.type.name }}
+    (<a {% if group.type.slug == "wg" %}href="{% url ietf.wginfo.views.group_charter acronym=group.acronym %}"{% endif %}>{{ group.acronym }}</a>) {{ group.type.name }}
   </div>
 
   <table id="metatable" width="100%">

ietf/templates/wginfo/1wg-charters-by-acronym.txt

@@ -1,4 +1,4 @@
-{% load ietf_filters %}{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}{{ wg }}
-{% endif %}{% endif %}{% endfor %}
-{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}{% include "wginfo/wg-charter.txt" %}
-{% endif %}{% endif %}{% endfor %}
+{% autoescape off %}{% load ietf_filters %}{% for group in groups %}{{ group.acronym }}
+{% endfor %}
+
+{% for group in groups %}{% include "wginfo/group_entry_with_charter.txt" %}{% endfor %}{% endautoescape %}

ietf/templates/wginfo/1wg-charters.txt

@@ -1,7 +1,6 @@
-{% load ietf_filters %}{% regroup wg_list|dictsort:"area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.name" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}{{ wg }}
-{% endif %}{% endif %}{% endfor %}{% endfor %}
+{% autoescape off %}{% load ietf_filters %}{% for area in areas %}{% for group in area.groups %}{{ group.acronym }}
+{% endfor %}{% endfor %}
+
+{% for area in areas %}{% for group in area.groups %}{% include "wginfo/group_entry_with_charter.txt" %}{% endfor %}{% endfor %}{% endautoescape %}
 
-{% regroup wg_list|dictsort:"area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.name" %}{% if wg.area.area.status_id == 1 and wg.area.area.acronym != "iesg" %}{% if wg.start_date %}
-{% include "wginfo/wg-charter.txt" %}
-{% endif %}{% endif %}{% endfor %}{% endfor %}
 

ietf/templates/wginfo/1wg-summary-by-acronym.txt

@@ -1,10 +1,10 @@
-{% load ietf_filters %}
+{% autoescape off %}{% load ietf_filters %}
            IETF Working Group Summary (By Acronym)
 
 
 The following Area Abbreviations are used in this document
-{% for area in area_list %}
-{{ area|upper }}	 - {{ area.area_acronym.name }}{% endfor %}
-{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% if wg.start_date %}
-{{ wg.group_acronym.name|safe }} ({{ wg }}) -- {{ wg.area.area|upper }}
-{% include "wginfo/wg_summary.txt" %}{% endif %}{% endfor %}
+{% for area in areas %}
+{{ area.acronym|upper }}	 - {{ area.name }}{% endfor %}
+{% for group in groups %}
+{{ group.name }} ({{ group.acronym }}) -- {{ group.parent.acronym|upper }}
+{% include "wginfo/group_entry.txt" %}{% endfor %}{% endautoescape %}

ietf/templates/wginfo/1wg-summary.txt

@@ -1,8 +1,11 @@
-{% load ietf_filters %}           IETF Working Group Summary (By Area)
-{% regroup wg_list|dictsort:"area.area.area_acronym.acronym" by area.area as wga_list %}{% for area in wga_list %}{% for wg in area.list|dictsort:"group_acronym.acronym" %}{% ifequal wg.area.area.status_id 1 %}{% if forloop.first %}
-{{ wg.area_acronym.name }} ({{ wg.area_acronym }})
-{{ wg.area_acronym.name|dashify }}------{% for ad in wg.area_directors %}
-  {{ ad.person }} <{{ ad.person.email.1 }}>{% endfor %}
-{% endif %}{% if wg.start_date %}
-{{ wg.group_acronym.name|safe }} ({{ wg }})
-{% include "wginfo/wg_summary.txt" %}{% endif %}{% endifequal %}{% endfor %}{% endfor %}
+{% autoescape off %}{% load ietf_filters %}
+           IETF Working Group Summary (By Area)
+
+
+{% for area in areas %}{{ area.name }} ({{ area.acronym }})
+{{ area.name|dashify }}------{% for ad in area.ads %}
+  {{ ad.person }} <{{ ad.address }}>{% endfor %}
+
+{% for group in area.groups %}{{ group.name }} ({{ group.acronym }})
+{% include "wginfo/group_entry.txt" %}
+{% endfor %}{% endfor %}{% endautoescape %}

ietf/templates/wginfo/wg-dirREDESIGN.html ietf/templates/wginfo/active_wgs.htmlietf/templates/wginfo/wg-dirREDESIGN.html renamed to ietf/templates/wginfo/active_wgs.html

@@ -25,7 +25,7 @@ <h1>Bofs</h1>
 {% for g in groups %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
   <td class="acronym">
-    <a href="{% url wg_charter acronym=g.acronym %}">{{ g.acronym }}</a>
+    <a href="{% url group_charter acronym=g.acronym %}">{{ g.acronym }}</a>
   </td>
   <td class="title">
     <a {%comment%}href="{% url doc_view name=g.charter.name %}"{%endcomment%}>{{ g.name }}</a>

ietf/templates/wginfo/bofs.html

@@ -28,7 +28,7 @@ <h1>Chartering or Re-Chartering Working Groups</h1>
 {% for g in groups %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
   <td class="acronym">
-    <a href="{% url wg_charter acronym=g.acronym %}">{{ g.acronym }}</a>
+    <a href="{% url group_charter acronym=g.acronym %}">{{ g.acronym }}</a>
   </td>
   <td class="title">
     <a href="{% url doc_view name=g.charter.name %}">{{ g.name }}</a>

ietf/templates/wginfo/chartering_wgs.html

@@ -28,7 +28,7 @@ <h1>Request closing of {{ wg.acronym }}</h1>
     {{ form.as_table }}
     <tr>
       <td colspan="2" class="actions">
-        <a href="{% url wg_charter acronym=wg.acronym %}">Back</a>
+        <a href="{% url group_charter acronym=wg.acronym %}">Back</a>
         <input type="submit" value="Send request"/>
       </td>
     </tr>

ietf/templates/wginfo/conclude.html

@@ -66,7 +66,7 @@ <h1>
       <td></td>
       <td class="actions">
 	{% ifequal action "edit" %}
-          <a href="{% url wg_charter acronym=wg.acronym %}">Back</a>
+          <a href="{% url group_charter acronym=wg.acronym %}">Back</a>
           <input type="submit" value="Save"/>
         {% else %} 
            {% ifequal action "charter" %}