From ebef6d06d832fab51d3a79d4462459b4b550ff50 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 23 Mar 2017 10:57:19 +0000 Subject: [PATCH] Reverted some links to htmlized draft versions, on request. - Legacy-Id: 13091 --- ietf/doc/templatetags/ietf_filters.py | 2 +- ietf/settings.py | 2 +- ietf/templates/submit/announce_to_authors.txt | 3 ++- ietf/templates/submit/announce_to_lists.txt | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index c5ee9b15e..1deca4466 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -197,7 +197,7 @@ def rfclink(string): URL for that RFC. """ string = str(string); - return "/doc/html/rfc" + string; + return "https://tools.ietf.org/html/rfc" + string; @register.filter(name='urlize_ietf_docs', is_safe=True, needs_autoescape=True) def urlize_ietf_docs(string, autoescape=None): diff --git a/ietf/settings.py b/ietf/settings.py index f4e5ad139..eaa8338f4 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -61,7 +61,7 @@ ALLOWED_HOSTS = [".ietf.org", ".ietf.org.", "209.208.19.216", "4.31.198.44", "12 TOOLS_SERVER = 'tools.' + IETF_DOMAIN TOOLS_SERVER_URL = 'https://' + TOOLS_SERVER TOOLS_ID_PDF_URL = TOOLS_SERVER_URL + '/pdf/' -TOOLS_ID_HTML_URL = '/doc/html/' +TOOLS_ID_HTML_URL = TOOLS_SERVER_URL + '/html/' # Override this in the settings_local.py file: SERVER_EMAIL = 'Django Server ' diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt index 60f5c7ef0..71cbf3a77 100644 --- a/ietf/templates/submit/announce_to_authors.txt +++ b/ietf/templates/submit/announce_to_authors.txt @@ -11,6 +11,7 @@ Group: {{ group }} Pages: {{ submission.pages }} URL: https://www.ietf.org/internet-drafts/{{ submission.name }}-{{ submission.rev }}.txt Status: https://datatracker.ietf.org/doc/{{ submission.name }}/ +Htmlized: https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }} Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }}-{{ submission.rev }} {% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} @@ -20,7 +21,7 @@ Abstract: {{ submission.note|default:"" }} Please note that it may take a couple of minutes from the time of submission -until the diff is available at tools.ietf.org. +until the htmlized version and diff are available at tools.ietf.org. The IETF Secretariat {% endautoescape %} diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt index 18f068b03..7ddcad55f 100644 --- a/ietf/templates/submit/announce_to_lists.txt +++ b/ietf/templates/submit/announce_to_lists.txt @@ -15,7 +15,8 @@ Abstract: The IETF datatracker status page for this draft is: https://datatracker.ietf.org/doc/{{ submission.name }}/ -There's also a htmlized version available at: +There are also htmlized versions available at: +https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }} https://datatracker.ietf.org/doc/html/{{ submission.name }}-{{ submission.rev }} {% if submission.rev != "00" %} A diff from the previous version is available at: @@ -23,7 +24,7 @@ A diff from the previous version is available at: {% endif %} Please note that it may take a couple of minutes from the time of submission -until the diff is available at tools.ietf.org. +until the htmlized version and diff are available at tools.ietf.org. Internet-Drafts are also available by anonymous FTP at: ftp://ftp.ietf.org/internet-drafts/