use doc.href rather than manually constructing URLs in several templates. Fixes ticket ietf-tools#1459. Commit ready for merge.

 - Legacy-Id: 8208

Author: rjsparks

ietf/settings.py

@@ -280,7 +280,7 @@ def skip_suspicious_operations(record):
 # versions right now, we'll point to external websites
 DOC_HREFS = {
     "charter": "http://www.ietf.org/charter/{doc.name}-{doc.rev}.txt",
-    "draft": "http://tools.ietf.org/html/{doc.name}-{doc.rev}",
+    "draft": "http://www.ietf.org/archive/id/{doc.name}-{doc.rev}.txt",
     "slides": "http://www.ietf.org/slides/{doc.name}-{doc.rev}",
     "conflrev": "http://www.ietf.org/cr/{doc.name}-{doc.rev}.txt",
     "statchg": "http://www.ietf.org/sc/{doc.name}-{doc.rev}.txt",

ietf/templates/doc/document_draft.html

@@ -277,7 +277,7 @@
 {% else %}
 
 <p>This Internet-Draft is no longer active. A copy of the expired Internet-Draft can be found here:<br/>
-<a href="http://www.ietf.org/archive/id/{{ doc.name }}-{{ doc.rev }}.txt">http://www.ietf.org/archive/id/{{ doc.name }}-{{ doc.rev }}.txt</a>
+<a href="{{doc.href}}">{{doc.href}}</a>
 
 <h4>Abstract</h4>
 

ietf/templates/iesg/agenda_conflict_doc.html

@@ -6,15 +6,15 @@
 
   <div>
     <a href="{% url "doc_view" name=doc.name %}">{{doc.name}}-{{doc.rev}}</a>
-    <a href="http://www.ietf.org/id/{{doc.name}}-{{doc.rev}}.txt">[txt]</a>
+    <a href="{{doc.href}}">[txt]</a>
 
     <br/>{{ doc.title }}
 
     {% with doc.conflictdoc as conflictdoc %}
 
     <div style="padding-left:30px;">
     <a href="{% url "doc_view" name=conflictdoc.name %}">{{ conflictdoc.name }}-{{ conflictdoc.rev }}</a>
-    <a href="http://www.ietf.org/id/{{ conflictdoc.name }}-{{ conflictdoc.rev }}.txt">[txt]</a>
+    <a href="{{ conflictdoc.href }}">[txt]</a>
     <br/>{{ conflictdoc.title }} ({{ conflictdoc.stream }}: {{ conflictdoc.intended_std_level }})
     {% if conflictdoc.note %}
     <br/>Note: {{ conflictdoc.note|linebreaksbr }}

ietf/templates/iesg/agenda_doc.html

@@ -9,8 +9,6 @@
     {% with doc.rfc_number as rfc_number %}
     {% if rfc_number %}
     <a href="http://www.rfc-editor.org/rfc/rfc{{rfc_number}}/">[txt]</a>
-    {% elif doc.type.slug == 'draft' %}
-    <a href="http://www.ietf.org/id/{{doc.name}}-{{doc.rev}}.txt">[txt]</a>
     {% else %}
     <a href="{{doc.href}}">[txt]</a>
     {% endif %}

ietf/templates/iesg/scribe_conflict_doc.html

@@ -2,12 +2,12 @@
       {{ doc.title }}
 
       <br><a href="{% url "doc_view" name=doc.canonical_name %}">{{doc.canonical_name}}</a>
-              <a href="http://www.ietf.org/id/{{doc.canonical_name}}-{{doc.rev}}.txt">[txt]</a>
+              <a href="{{doc.href}}">[txt]</a>
 
       <div style="padding-left:20px">
           {{ doc.conflictdoc.title }} ({{ doc.conflictdoc.stream }}: {{ doc.conflictdoc.intended_std_level }})
           <br><a href="{% url "doc_view" name=doc.conflictdoc.canonical_name %}">{{ doc.conflictdoc.canonical_name }}</a>
-                  <a href="http://www.ietf.org/id/{{ doc.conflictdoc.canonical_name }}-{{ doc.conflictdoc.rev }}.txt">[txt]</a>
+                  <a href="{{doc.conflictdoc.href}}">[txt]</a>
           {% if doc.conflictdoc.note %}
           <br>Note: {{ doc.conflictdoc.note|linebreaksbr }}
           {% endif %}

ietf/templates/iesg/scribe_doc.html

@@ -5,7 +5,7 @@
           {% if rfc_number %}
               <a href="http://www.rfc-editor.org/rfc/rfc{{ rfc_number }}/">[txt]</a>
           {% else %}
-              <a href="http://www.ietf.org/id/{{ doc.canonical_name }}-{{ doc.rev }}.txt">[txt]</a>
+              <a href="{{doc.href}}">[txt]</a>
           {% endif %}
       {% endwith %}