Make obsoletes/updates/etc. lists links (with new urlize_ietf_docs template filter)

 - Legacy-Id: 2020

Author: pasieronen

ietf/idtracker/templatetags/ietf_filters.py

@@ -4,16 +4,16 @@
 import django
 from django import template
 from django.utils.html import escape, fix_ampersands
-from django.template.defaultfilters import linebreaksbr, wordwrap
+from django.template.defaultfilters import linebreaksbr, wordwrap, stringfilter
 from django.template import resolve_variable
+from django.utils.safestring import mark_safe, SafeData
 try:
     from email import utils as emailutils
 except ImportError:
     from email import Utils as emailutils
 import re
 import datetime
 import types
-#from ietf.utils import log
 
 register = template.Library()
 
@@ -215,6 +215,20 @@ def rfclink(string):
     string = str(string);
     return "http://tools.ietf.org/html/rfc" + string;
 
+@register.filter(name='urlize_ietf_docs')
+def urlize_ietf_docs(string, autoescape=None):
+    """
+    Make occurrences of RFC NNNN and draft-foo-bar links to /doc/.
+    """
+    if autoescape and not isinstance(string, SafeData):
+        string = escape(string)
+    string = re.sub("(?<!>)(RFC ?)0{0,3}(\d+)", "<a href=\"/doc/rfc\\2/\">\\1\\2</a>", string)
+    string = re.sub("(?<!>)(draft-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
+    return mark_safe(string)
+urlize_ietf_docs.is_safe = True
+urlize_ietf_docs.needs_autoescape = True
+urlize_ietf_docs = stringfilter(urlize_ietf_docs)
+
 @register.filter(name='dashify')
 def dashify(string):
     """

ietf/templates/idrfc/doc_main_id.html

@@ -39,7 +39,7 @@
 
 {% block doc_metatable %}
 <tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}
-{% with doc.replaces as r %}{% if r %}<br />Replaces {% for rep in r %}<a href="/doc/{{rep}}/">{{rep}}</a>{% if not forloop.last %}, {%endif%}{% endfor %}{% endif %}{% endwith %}
+{% with doc.replaces as r %}{% if r %}<br />Replaces {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}{% endif %}{% endwith %}
 </td></tr>
 <tr><td>Last updated:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
 <tr><td>State:</td><td> 

ietf/templates/idrfc/doc_main_rfc.html

@@ -39,10 +39,10 @@
 
 {% block doc_metatable %}
 <tr><td style="width:18ex;">Document type:</td><td>RFC - {{ doc.maturity_level }}
-{% if doc.obsoleted_by %}<br />Obsoleted by {{ doc.obsoleted_by }}{%endif %}
-{% if doc.updated_by %}<br />Updated by {{ doc.updated_by }}{%endif %}
-{% if doc.obsoletes %}<br />Obsoletes {{ doc.obsoletes }}{%endif %}
-{% if doc.updates %}<br />Updates {{ doc.updates }}{%endif %}
+{% if doc.obsoleted_by %}<br />Obsoleted by {{ doc.obsoleted_by|urlize_ietf_docs }}{%endif %}
+{% if doc.updated_by %}<br />Updated by {{ doc.updated_by|urlize_ietf_docs }}{%endif %}
+{% if doc.obsoletes %}<br />Obsoletes {{ doc.obsoletes|urlize_ietf_docs }}{%endif %}
+{% if doc.updates %}<br />Updates {{ doc.updates|urlize_ietf_docs }}{%endif %}
 {% if doc.draft_name %}<br/ >Was <a href="/doc/{{ doc.draft_name}}/">{{doc.draft_name}}</a>{% endif %}
 </td></tr>
 <tr><td>Published:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>

ietf/templates/idrfc/search_result_row.html

@@ -48,8 +48,8 @@
 <td class="status">{{ doc.friendly_state|safe }}
 {% if not doc.rfc %}{{ doc.id|state_age_colored|safe }}{% endif %}
 {% if doc.rfc %}
-{% if doc.rfc.obsoleted_by %}<br />Obsoleted by {{ doc.rfc.obsoleted_by }}{%endif %}
-{% if doc.rfc.updated_by %}<br />Updated by {{ doc.rfc.updated_by }}{%endif %}
+{% if doc.rfc.obsoleted_by %}<br />Obsoleted by {{ doc.rfc.obsoleted_by|urlize_ietf_docs }}{%endif %}
+{% if doc.rfc.updated_by %}<br />Updated by {{ doc.rfc.updated_by|urlize_ietf_docs }}{%endif %}
 {% if doc.rfc.has_errata %}<br /><a href="http://www.rfc-editor.org/errata_search.php?rfc={{doc.rfc.rfc_number}}" rel="nofollow">Errata</a>{% endif %}
 {% else %}
   {% if doc.id.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.id.draft_name}}">{{ doc.id.rfc_editor_state|escape }}</a>{% endif %}