Added corrections and tests as discussed with Ole.

 - Legacy-Id: 3349

Author: Martin Qvist

ietf/settings.py

@@ -177,6 +177,8 @@
 INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/'
 INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
+CHARTER_PATH = '/a/www/ietf-ftp/charters/'
+CHARTER_TXT_URL = 'http://www.ietf.org/charters/'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s'
 MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'

ietf/templates/wgrecord/add_comment.html

@@ -27,7 +27,7 @@ <h1>Add comment on {{ wg.acronym }}</h1>
   <tr>
     <td></td>
     <td class="actions">
-      <a href="{% url record_view name=wg.acronym %}">Back</a>
+      <a href="{% url wg_view_record name=wg.acronym %}">Back</a>
       <input type="submit" value="Add comment"/>
     </td>
   </tr>

ietf/templates/wgrecord/approve_ballot.html

@@ -30,7 +30,7 @@ <h1>Approve Ballot for {{ wg.acronym }}</h1>
   </div>
 
   <div class="actions">
-    <a href="{% url record_view name=wg.acronym %}">Back</a>
+    <a href="{% url wg_view_record name=wg.acronym %}">Back</a>
     <input type="submit" value="Send out the announcement, close ballot and update revision"/>
   </div>
 </form>

ietf/templates/wgrecord/change_state.html

@@ -43,7 +43,7 @@ <h1>Change state of {{ wg.acronym }}</h1>
     {% endfor %}
     <tr>
       <td colspan="2" class="actions">
-        <a href="{% url record_view name=wg.acronym %}">Back</a>
+        <a href="{% url wg_view_record name=wg.acronym %}">Back</a>
         <input type="submit" value="Save"/>
       </td>
     </tr>
@@ -68,10 +68,9 @@ <h3>Or revert to previous state</h3>
   var message = {
    "infrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to Informal IESG review by {{ login.name }}",
    "intrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to Internal review by {{ login.name }}. Please place it on the next IESG telechat and inform the IAB.",
-   "extrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to External review by {{ login.name }}. Please send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: ",
-   "approved": "The WG {{ wg.name }} ({{ wg.acronym }}) has been approved. Please publish the charter and sent the appropriate announcements."
+   "extrev": "The WG {{ wg.name }} ({{ wg.acronym }}) has been set to External review by {{ login.name }}. Please send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: "
   };
 
 </script>
-<script type="text/javascript" src="/js/rec-change-state.js"></script>
+<script type="text/javascript" src="/js/wg-change-state.js"></script>
 {% endblock %}

ietf/templates/wgrecord/conclude.html

@@ -3,7 +3,7 @@
 {% block title %}Request closing of WG {{ wg.acronym }}{% endblock %}
 
 {% block morecss %}
-#id_comment {
+#id_instructions {
   width: 40em;
 }
 
@@ -28,7 +28,7 @@ <h1>Request closing of {{ wg.acronym }}</h1>
     {{ form.as_table }}
     <tr>
       <td colspan="2" class="actions">
-        <a href="{% url record_view name=wg.acronym %}">Back</a>
+        <a href="{% url wg_view_record name=wg.acronym %}">Back</a>
         <input type="submit" value="Send request"/>
       </td>
     </tr>

ietf/templates/wgrecord/edit_info.html

@@ -78,7 +78,7 @@ <h1>{% if wg %}
       <td></td>
       <td class="actions">
 	{% if wg %}
-          <a href="{% url record_view name=wg.acronym %}">Back</a>
+          <a href="{% url wg_view_record name=wg.acronym %}">Back</a>
 	{% endif %}
         <input type="submit" value="Save"/>
       </td>

ietf/templates/wgrecord/edit_position.html

@@ -71,5 +71,5 @@ <h1>Change position for {{ ad.name }} on {{ wg.acronym }}</h1>
 {% endblock %}
 
 {% block content_end %}
-<script type="text/javascript" src="/js/rec-edit-position.js"></script>
+<script type="text/javascript" src="/js/wg-edit-position.js"></script>
 {% endblock %}

ietf/templates/wgrecord/record_ballot.html

@@ -6,10 +6,10 @@
 
 {% if user|in_group:"Area_Director,Secretariat" %}
 {% if user|in_group:"Area_Director" %}
-<div style="margin-top:8px; margin-bottom:8px;"><span id="rec_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url rec_edit_position name=wg.acronym %}">Edit position</a></span></span></div>
+<div style="margin-top:8px; margin-bottom:8px;"><span id="wg_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url wg_edit_position name=wg.acronym %}">Edit position</a></span></span></div>
 {% endif %}
 {% if user|in_group:"Secretariat" %}
-<div style="margin-top:8px; margin-bottom:8px;"><span id="rec_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url rec_approve_ballot name=wg.acronym %}">Approve ballot</a></span></span></div>
+<div style="margin-top:8px; margin-bottom:8px;"><span id="wg_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url wg_approve_ballot name=wg.acronym %}">Approve ballot</a></span></span></div>
 {% endif %}
 {% endif %}
 
@@ -27,7 +27,7 @@
 
 <p><span class="square" style="background:white;"></span><b>No Record</b><br/>
 {% for p in info.pos_no_record %}
-<a{% if user|in_group:"Secretariat" %} href="{% url rec_edit_position name=wg.acronym %}?ad={{ p.id }}" title="Click to edit the position of {{ p.name }}"{% endif %}>{{p.name}}</a><br/>
+<a{% if user|in_group:"Secretariat" %} href="{% url wg_edit_position name=wg.acronym %}?ad={{ p.id }}" title="Click to edit the position of {{ p.name }}"{% endif %}>{{p.name}}{% if user|in_group:"Secretariat" %}</a>{% endif %}<br/>
 {% empty %}
 <i>none</i>
 {% endfor %}

ietf/templates/wgrecord/record_ballot_list.html

@@ -1,6 +1,6 @@
 {% load ietf_filters %}
 {% for p in positions %}
-{% if p.is_old_ad %}[{%endif%}<a{% if user|in_group:"Secretariat" %} href="{% url rec_edit_position name=wg.acronym %}?ad={{ p.ad_id }}" title="Click to edit the position of {{ p.ad }}"{% endif %}>{{p.ad}}</a>{% if p.is_old_ad %}]{%endif%}{% if p.comment or p.block_comment %}&nbsp;<a href="#{{p.ad|slugify}}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}<br/>
+{% if p.is_old_ad %}[{%endif%}<a{% if user|in_group:"Secretariat" %} href="{% url wg_edit_position name=wg.acronym %}?ad={{ p.ad_id }}" title="Click to edit the position of {{ p.ad }}"{% endif %}>{{p.ad}}</a>{% if p.is_old_ad %}]{%endif%}{% if p.comment or p.block_comment %}&nbsp;<a href="#{{p.ad|slugify}}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}<br/>
 {% if p.old_positions %}<span class="was">(was {{p.old_positions|join:", "}})</span><br/>{%endif%}
 {% empty %}
 <i>none</i>

ietf/templates/wgrecord/record_tab_charter.html

@@ -7,7 +7,7 @@
 {% load ietf_filters %}
 
 {% block record_revision %}
-Snapshots: {% if not snapshot %}<strong>{% else %}<a href="{% url record_view name=wg.acronym %}">{% endif %}current{% if not snapshot %}</strong>{% else %}</a>{% endif %} {% for d in versions reversed %}{% ifnotequal d.rev wg.charter.rev %}{% ifequal snapshot d.rev %}<strong>{% else %}<a href="{% url record_view name=wg.acronym %}{{d.rev}}/">{% endifequal %}{{ d.rev }}{% ifequal snapshot d.rev %}</strong>{% else %}</a>{% endifequal %} {% endifnotequal %}{% endfor %}
+Snapshots: {% if not snapshot %}<strong>{% else %}<a href="{% url wg_view_record name=wg.acronym %}">{% endif %}current{% if not snapshot %}</strong>{% else %}</a>{% endif %} {% for d in versions reversed %}{% ifnotequal d.rev wg.charter.rev %}{% ifequal snapshot d.rev %}<strong>{% else %}<a href="{% url wg_view_record name=wg.acronym %}{{d.rev}}/">{% endifequal %}{{ d.rev }}{% ifequal snapshot d.rev %}</strong>{% else %}</a>{% endifequal %} {% endifnotequal %}{% endfor %}
 {% endblock %}
 
 {% block record_metatable %}