altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [18995] from rjsparks@nostrum.com:

Browse source 
Link only to datatracker htmlization. Adjust mail-to-authors and mail-to-list. Fixes #3261.
 - Legacy-Id: 19005
Note: SVN reference [18995] has been migrated to Git commit 06a46567b2c5778465466285398a72a195c2f4a5
This commit is contained in:
Robert Sparks 2021-05-19 13:49:46 +00:00
parent 11551c8a65
commit 4298cf08ab
9 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/doc/templatetags/ietf_filters.py
View file

@ -216,7 +216,7 @@ def rfclink(string):
URL for that RFC.
"""
string = str(string);
return "https://tools.ietf.org/html/rfc" + string;
return "https://datatracker.ietf.org/doc/html/rfc" + string;
@register.filter(name='urlize_ietf_docs', is_safe=True, needs_autoescape=True)
def urlize_ietf_docs(string, autoescape=None):

2
ietf/doc/utils.py
View file

@ -1033,7 +1033,6 @@ def build_file_urls(doc):
file_urls.append(("pdf", base + "pdfrfc/" + name + ".txt.pdf"))
if "txt" in found_types:
file_urls.append(("htmlized (tools)", settings.TOOLS_ID_HTML_URL + name))
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=name))))
if doc.tags.filter(slug="verified-errata").exists():
file_urls.append(("with errata", settings.RFC_EDITOR_INLINE_ERRATA_URL.format(rfc_number=doc.rfc_number())))
@ -1050,7 +1049,6 @@ def build_file_urls(doc):
if "pdf" not in found_types:
file_urls.append(("pdf", settings.TOOLS_ID_PDF_URL + doc.name + "-" + doc.rev + ".pdf"))
file_urls.append(("htmlized (tools)", settings.TOOLS_ID_HTML_URL + doc.name + "-" + doc.rev))
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_main',kwargs=dict(name=doc.name,rev=doc.rev))+"bibtex"))

2
ietf/templates/api/index.html
View file

@ -330,7 +330,7 @@
<p>
When sending notifications to other APIs, the datatracker may sign
information with a <a href="https://tools.ietf.org/html/rfc7515">RFC
information with a <a href="https://datatracker.ietf.org/doc/html/rfc7515">RFC
7515: JSON Web Signature (JWS)</a>, using a public/private keypair with
this public key:

2
ietf/templates/help/personal-information.html
View file

@ -10,7 +10,7 @@
<h1>Personal Information in the Datatracker</h1>
<p>
<a href="https://tools.ietf.org/html/rfc3935">RFC 3935, "A Mission Statement for the IETF"</a> lays out
<a href="https://datatracker.ietf.org/doc/html/rfc3935">RFC 3935, "A Mission Statement for the IETF"</a> lays out
the goal and the mission of the IETF as follows:
</p>

8
ietf/templates/submit/announce_to_authors.txt
View file

@ -11,9 +11,8 @@ Group: {{ group }}
Pages: {{ submission.pages }}
URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt
Status: https://datatracker.ietf.org/doc/{{ submission.name }}/{% if submission.xml_version == "3" %}
Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %}
Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }}{% endif %}
Htmlized: https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }}
Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %}
Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }}
{% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %}
Abstract:
@ -21,8 +20,5 @@ Abstract:
{{ submission.note|default:"" }}
Please note that it may take a couple of minutes from the time of submission
until the htmlized version and diff are available at tools.ietf.org.
The IETF Secretariat
{% endautoescape %}

6
ietf/templates/submit/announce_to_lists.txt
View file

@ -17,17 +17,13 @@ https://datatracker.ietf.org/doc/{{ submission.name }}/
{% if submission.xml_version == "3" %}
There is also an HTML version available at:
{{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %}
There are also htmlized versions available at:
https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }}
There is also an htmlized version available at:
https://datatracker.ietf.org/doc/html/{{ submission.name }}-{{ submission.rev }}{% endif %}
{% if submission.rev != "00" %}
A diff from the previous version is available at:
{{settings.RFCDIFF_BASE_URL}}?url2={{ submission.name }}-{{ submission.rev }}
{% endif %}
Please note that it may take a couple of minutes from the time of submission
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/
{% endautoescape %}

12
ietf/templates/submit/note_well.html
View file

@ -64,30 +64,30 @@
</p>
<ul>
<li>
<a href="https://tools.ietf.org/html/bcp9">BCP 9</a>
<a href="https://datatracker.ietf.org/doc/html/bcp9">BCP 9</a>
(Internet Standards Process)
</li>
<li>
<a href="https://tools.ietf.org/html/bcp25"> BCP 25 </a>
<a href="https://datatracker.ietf.org/doc/html/bcp25"> BCP 25 </a>
(Working Group processes)
</li>
<li>
<a href="https://tools.ietf.org/html/bcp25"> BCP 25 </a>
<a href="https://datatracker.ietf.org/doc/html/bcp25"> BCP 25 </a>
(Anti-Harassment Procedures)
</li>
<li>
<a href="https://tools.ietf.org/html/bcp54"> BCP 54 </a>
<a href="https://datatracker.ietf.org/doc/html/bcp54"> BCP 54 </a>
(Code of Conduct)
</li>
<li>
<a href="https://tools.ietf.org/html/bcp78"> BCP 78 </a>
<a href="https://datatracker.ietf.org/doc/html/bcp78"> BCP 78 </a>
(Copyright)
</li>
<li>
<a href="https://tools.ietf.org/html/bcp79"> BCP 79 </a>
<a href="https://datatracker.ietf.org/doc/html/bcp79"> BCP 79 </a>
(Patents, Participation)
</li>

2
ietf/templates/submit/submission_status.html
View file

@ -49,7 +49,7 @@
under normal circumstances.</b> If you plan to request publication as an RFC, this
will require additional consideration by the stream manager (for example, the
IESG), and publication may be declined unless sufficient justification is
provided. See <a href="https://tools.ietf.org/html/rfc7322#section-4.1.1">
provided. See <a href="https://datatracker.ietf.org/doc/html/rfc7322#section-4.1.1">
RFC 7322, section 4.1.1</a> for details.</p>
{% endif %}

2
ietf/templates/utils/wiki/InterMapTxt
View file

@ -44,7 +44,7 @@ trac-dev http://thread.gmane.org/gmane.comp.version-control.subversion.trac.deve
Mercurial http://www.selenic.com/mercurial/wiki/index.cgi/ # the wiki for the Mercurial distributed SCM
RFC http://tools.ietf.org/html/rfc$1.html # IETF's RFC $1
RFC http://datatracker.ietf.org/doc/html/rfc$1.html # IETF's RFC $1
DataTracker https://datatracker.ietf.org/doc/
dt https://datatracker.ietf.org/doc/