Parameterize the <wg> in /wg/<acronym> to allow for RGs, add simple /rg/ overview page based on similar /wg/ overview page, fix links and other WG/RG-specific details. All the basic pages under /rg/ now appear to be working for RGs. Edit pages and permissions are not adapted yet, though.

 - Legacy-Id: 7535

Author: OleLaursen

ietf/community/display.py

@@ -88,7 +88,7 @@ def get_value(self, document, raw=False):
         if raw:
             return document.group.acronym
         else:
-            return '<a href="%s">%s</a>' % (urlreverse('wg_docs', kwargs={'acronym':document.group.acronym}), document.group.acronym) if (document.group and document.group.acronym != 'none')  else ''
+            return '<a href="%s">%s</a>' % (urlreverse('group_docs', kwargs=dict(group_type=document.group.type_id, acronym=document.group.acronym)), document.group.acronym) if (document.group and document.group.acronym != 'none')  else ''
 
 
 class ADField(DisplayField):

ietf/doc/views_doc.py

@@ -242,7 +242,7 @@ def document_main(request, name, rev=None):
         elif group.type_id in ("rg", "wg"):
             submission = "%s %s" % (group.acronym, group.type)
             if group.type_id == "wg":
-                submission = "<a href=\"%s\">%s</a>" % (urlreverse("wg_docs", kwargs=dict(acronym=doc.group.acronym)), submission)
+                submission = "<a href=\"%s\">%s</a>" % (urlreverse("group_docs", kwargs=dict(group_type=doc.group.type_id, acronym=doc.group.acronym)), submission)
             if doc.stream_id and doc.get_state_slug("draft-stream-%s" % doc.stream_id) == "c-adopt":
                 submission = "candidate for %s" % submission
 

ietf/templates/base/left_menu.html

@@ -73,8 +73,8 @@
   </div></div></li>
 
   <li style="padding-top:0;"><a href="/wg/">Active WGs</a></li>
-  <li><a href="{% url "ietf.wginfo.views.chartering_wgs" %}">Chartering WGs</a></li>
-  <li><a href="{% url "ietf.wginfo.views.bofs" %}">BoFs</a></li>
+  <li><a href="{% url "ietf.wginfo.views.chartering_wgs" group_type="wg" %}">Chartering WGs</a></li>
+  <li><a href="{% url "ietf.wginfo.views.bofs" group_type="wg" %}">BoFs</a></li>
   <li><a href="http://tools.ietf.org/wg/concluded">Concluded WGs</a></li>
   <li><a href="http://www.ietf.org/list/nonwg.html">Non-WG Lists</a></li>
 

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.group_charter" acronym=group.acronym %}"{% endif %}>{{ group.acronym }}</a>) {{ group.type.name }}
+    (<a {% if group.type.slug == "wg" %}href="{% url "ietf.wginfo.views.group_charter" group_type=group.type_id acronym=group.acronym %}"{% endif %}>{{ group.acronym }}</a>) {{ group.type.name }}
   </div>
 
   <table id="metatable" width="100%">
@@ -132,7 +132,7 @@ <h3>Charter {{ doc.canonical_name }}-{{ doc.rev }}
 {% if not snapshot and chartering %}
 <h3>Proposed Milestones
 {% if user|has_role:"Area Director,Secretariat" %}
-<a class="edit" href="{% url "wg_edit_charter_milestones" acronym=doc.group.acronym %}">Edit charter milestones</a>
+<a class="edit" href="{% url "group_edit_charter_milestones" group_type=doc.group.type_id acronym=doc.group.acronym %}">Edit charter milestones</a>
 {% endif %}
 </h3>
 

ietf/templates/iesg/milestones_needing_review.html

@@ -15,7 +15,7 @@ <h3 class="ad">{{ ad.plain_name }}</h4>
 
 {% for g in ad.groups_needing_review %}
 
-<div class="milestones-for-group">{{ g.name }} ({{ g.acronym }}) <a href="{% url "wg_edit_milestones" acronym=g.acronym %}">has new milestones</a>:</div>
+<div class="milestones-for-group">{{ g.name }} ({{ g.acronym }}) <a href="{% url "group_edit_milestones" group_type=g.type_id acronym=g.acronym %}">has new milestones</a>:</div>
 
 {% include "wginfo/milestones.html" with milestones=g.milestones_needing_review %}
 

ietf/templates/wginfo/active_rgs.html

@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block title %}Active IRTF Research Groups{% endblock %}
+
+{% block morecss %}
+.ietf-wg-table { width: 100%; max-width:50em; }
+.ietf-wg-table tr { vertical-align:top; }
+{% endblock morecss %}
+
+{% block content %}
+<h1>Active IRTF Research Groups</h1>
+
+<p>IRTF Chair:</p>
+
+<div style="margin-left:2em;">
+  <a href="mailto:irtf-chair@irtf.org">{{ irtf.chair.person.plain_name }}</a>
+</div>
+
+<p>Active Research Groups:</p>
+
+<div style="margin-left:2em;">
+   <table class="ietf-wg-table">
+      {% for group in groups %}
+      <tr>
+         <td width="10%;"><a href="{% url "ietf.wginfo.views.group_documents" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
+         <td width="50%">{{ group.name }}</td>
+         <td width="40%">{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
+      </tr>
+      {% endfor %}
+   </table>
+</div>
+
+{% endblock %}

ietf/templates/wginfo/active_wgs.html

@@ -80,7 +80,7 @@ <h2 class="ietf-divider" id="{{area.name|cut:" "}}">{{ area.name }}</h2>
       <table class="ietf-wg-table">
          {% for group in area.groups %}
 	 <tr>
-	    <td width="10%;"><a href="/wg/{{ group.acronym }}/">{{ group.acronym }}</a></td>
+            <td width="10%;"><a href="{% url "ietf.wginfo.views.group_documents" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
 	    <td width="1%">{% for ad in area.ads %}{% if ad.person_id == group.ad_id %}<span title="AD for {{ group.acronym }}: {{ ad.person }}" class="square bgcolor{{forloop.counter}}"></span>{% endif %}{% endfor %}</td>
 	    <td width="50%">{{ group.name }}</td>
 	    <td width="39%">{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>

ietf/templates/wginfo/bofs.html

@@ -10,7 +10,7 @@ <h1>Bofs</h1>
 <p>Groups in the BoF state</p>
 
 {% if user|has_role:"Area Director,Secretariat" %}
-<p><a href="{% url "bof_create" %}">Create a new BoF</a></p>
+<p><a href="{% url "bof_create" group_type="wg" %}">Create a new BoF</a></p>
 {% endif %}
 
 {% if not groups %}
@@ -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 "group_charter" acronym=g.acronym %}">{{ g.acronym }}</a>
+    <a href="{% url "group_charter" group_type=g.type_id 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/chartering_wgs.html

@@ -12,7 +12,7 @@ <h1>Chartering or Re-Chartering Working Groups</h1>
 {% for s in charter_states %}{% if not forloop.first %}, {% if forloop.last %}or {% endif %}{% endif %}<i>{{ s.name }}</i>{% endfor %}.</p>
 
 {% if user|has_role:"Area Director,Secretariat" %}
-<p><a href="{% url "wg_create" %}">Start chartering new WG</a></p>
+<p><a href="{% url "group_create" group_type="wg" %}">Start chartering new WG</a></p>
 {% endif %}
 
 {% if not groups %}
@@ -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 "group_charter" acronym=g.acronym %}">{{ g.acronym }}</a>
+    <a href="{% url "group_charter" group_type=g.type_id 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/conclude.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Request closing of {{ wg.acronym }} {{ wg.type.name }}{% endblock %}
+{% block title %}Request closing of {{ group.acronym }} {{ group.type.name }}{% endblock %}
 
 {% block morecss %}
 #id_instructions {
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block content %}
-<h1>Request closing of {{ wg.acronym }} {{ wg.type.name }}</h1>
+<h1>Request closing of {{ group.acronym }} {{ group.type.name }}</h1>
 
 <p>
    Please provide instructions regarding the disposition of each
@@ -29,7 +29,7 @@ <h1>Request closing of {{ wg.acronym }} {{ wg.type.name }}</h1>
     {{ form.as_table }}
     <tr>
       <td colspan="2" class="actions">
-        <a class="button" href="{% url "group_charter" acronym=wg.acronym %}">Cancel</a>
+        <a class="button" href="{% url "group_charter" group_type=group.type_id acronym=group.acronym %}">Cancel</a>
         <input class="button" type="submit" value="Send request"/>
       </td>
     </tr>