diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index a0edacf41..26e0f82b9 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -169,16 +169,14 @@ def doc_canonical_name(name): return "" -def link_charter_doc_match1(match): +def link_charter_doc_match(match): if not doc_canonical_name(match[0]): return match[0] - return f'{match[0]}' - - -def link_charter_doc_match2(match): - if not doc_canonical_name(match[0]): - return match[0] - return f'{match[0]}' + url = urlreverse( + "ietf.doc.views_doc.document_main", + kwargs=dict(name=match[1][:-1], rev=match[2]), + ) + return f'{match[0]}' def link_non_charter_doc_match(match): @@ -187,20 +185,26 @@ def link_non_charter_doc_match(match): if not cname: return match[0] if name == cname: - return f'{match[0]}' + url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=cname)) + return f'{match[0]}' # if we get here, the name probably has a version number and/or extension at the end rev_split = re.search(r"^(" + re.escape(cname) + r")-(\d{2,})", name) if rev_split: name = rev_split.group(1) else: - return f'{match[0]}' + url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=cname)) + return f'{match[0]}' cname = doc_canonical_name(name) if not cname: return match[0] if name == cname: - return f'{match[0]}' + url = urlreverse( + "ietf.doc.views_doc.document_main", + kwargs=dict(name=cname, rev=rev_split.group(2)), + ) + return f'{match[0]}' # if we get here, we can't linkify return match[0] @@ -211,44 +215,33 @@ def link_other_doc_match(match): rev = match[3] if not doc_canonical_name(doc + rev): return match[0] - return f'{match[1]}' + url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc + rev)) + return f'{match[1]}' @register.filter(name="urlize_ietf_docs", is_safe=True, needs_autoescape=True) def urlize_ietf_docs(string, autoescape=None): """ - Make occurrences of RFC NNNN and draft-foo-bar links to /doc/. + Make occurrences of RFC NNNN and draft-foo-bar links to the doc pages. """ if autoescape and not isinstance(string, SafeData): if "<" in string: string = escape(string) else: string = mark_safe(string) - exp1 = r"\b(?' + n +'' + names = [f'{n}' for n, __ in names if n not in names_to_skip] categories.append((state, diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py index fb6c560f1..2660edcc9 100644 --- a/ietf/ietfauth/views.py +++ b/ietf/ietfauth/views.py @@ -744,11 +744,11 @@ def login(request, extra_context=None): logout(request) response = render(request, 'registration/missing_person.html') if require_consent: - messages.warning(request, mark_safe(''' + messages.warning(request, mark_safe(f''' You have personal information associated with your account which is not derived from draft submissions or other ietf work, namely: %s. Please go - to your account profile and review your + to your account profile and review your personal information, then scoll to the bottom and check the 'confirm' checkbox and submit the form, in order to to indicate that that the provided personal information may be used and displayed within the IETF diff --git a/ietf/secr/templates/base_site.html b/ietf/secr/templates/base_site.html index 5a15244ab..d369a40ec 100644 --- a/ietf/secr/templates/base_site.html +++ b/ietf/secr/templates/base_site.html @@ -14,7 +14,7 @@
- {% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: {{ user }} | Log out + {% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: {{ user }} | Log out @@ -36,4 +36,4 @@ AMS -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/base_site_bootstrap.html b/ietf/secr/templates/base_site_bootstrap.html index d50e0cb3e..c1c2fdac6 100644 --- a/ietf/secr/templates/base_site_bootstrap.html +++ b/ietf/secr/templates/base_site_bootstrap.html @@ -14,7 +14,7 @@
- {% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: {{ user }} | Log out + {% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: {{ user }} | Log out @@ -36,4 +36,4 @@ AMS -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/includes/meetings_footer.html b/ietf/secr/templates/includes/meetings_footer.html index 9e9e98677..71a30ed94 100755 --- a/ietf/secr/templates/includes/meetings_footer.html +++ b/ietf/secr/templates/includes/meetings_footer.html @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/ietf/secr/templates/proceedings/interim_directory.html b/ietf/secr/templates/proceedings/interim_directory.html index f01d59f54..66d0b9714 100644 --- a/ietf/secr/templates/proceedings/interim_directory.html +++ b/ietf/secr/templates/proceedings/interim_directory.html @@ -13,7 +13,7 @@ {% for meeting in meetings %} {{ meeting.date }} - {{ meeting.group.acronym }} + {{ meeting.group.acronym }} {% if meeting.schedule %} Agenda {% else %} @@ -33,4 +33,4 @@ {% endfor %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/locked.html b/ietf/secr/templates/sreq/locked.html index cc3efe00a..5f619f37c 100755 --- a/ietf/secr/templates/sreq/locked.html +++ b/ietf/secr/templates/sreq/locked.html @@ -12,7 +12,7 @@ {% endblock %} {% block content %} -

» View list of timeslot requests

+

» View list of timeslot requests

Sessions - Status

@@ -27,4 +27,4 @@
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html index 726c09671..bdb33bb77 100755 --- a/ietf/secr/templates/sreq/main.html +++ b/ietf/secr/templates/sreq/main.html @@ -16,7 +16,7 @@ {% endblock %} {% block content %} -

» View list of timeslot requests

+

» View list of timeslot requests

Sessions Request Tool: IETF {{ meeting.number }} diff --git a/ietf/secr/templates/sreq/session_approval_notification.txt b/ietf/secr/templates/sreq/session_approval_notification.txt index c2ad5fc7b..7bb63aa3f 100644 --- a/ietf/secr/templates/sreq/session_approval_notification.txt +++ b/ietf/secr/templates/sreq/session_approval_notification.txt @@ -5,7 +5,7 @@ submitted by {{ requester }}. The third session requires your approval. To approve the session go to the session request view here: -https://datatracker.ietf.org{% url "ietf.secr.sreq.views.view" acronym=group.acronym %} +{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.secr.sreq.views.view" acronym=group.acronym %} and click "Approve Third Session". Regards, diff --git a/ietf/secr/templates/telechat/main.html b/ietf/secr/templates/telechat/main.html index b828c6657..3f2fac144 100644 --- a/ietf/secr/templates/telechat/main.html +++ b/ietf/secr/templates/telechat/main.html @@ -7,6 +7,6 @@ {{ form.date.label_tag }} {{ form.date }}  
- Add a new Telechat Date + Add a new Telechat Date

{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/telechat/management.html b/ietf/secr/templates/telechat/management.html index a4bce9b0f..817891f08 100644 --- a/ietf/secr/templates/telechat/management.html +++ b/ietf/secr/templates/telechat/management.html @@ -14,8 +14,8 @@ {% endfor %}
- Add a new Management Issue + Add a new Management Issue -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/settings.py b/ietf/settings.py index 5483fdd33..18ad041c9 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -515,9 +515,6 @@ CORS_URLS_REGEX = r'^(/api/.*|.*\.json|.*/json/?)$' # Setting for django_referrer_policy.middleware.ReferrerPolicyMiddleware REFERRER_POLICY = 'strict-origin-when-cross-origin' -# Content security policy configuration (django-csp) -CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", "data: https://datatracker.ietf.org/ https://www.ietf.org/ https://analytics.ietf.org/") - # django.middleware.security.SecurityMiddleware SECURE_BROWSER_XSS_FILTER = True SECURE_CONTENT_TYPE_NOSNIFF = True @@ -541,6 +538,9 @@ RFCDIFF_BASE_URL = "https://www.ietf.org/rfcdiff" IDNITS_BASE_URL = "https://www.ietf.org/tools/idnits" XML2RFC_BASE_URL = "https://xml2rfc.tools.ietf.org/experimental.html" +# Content security policy configuration (django-csp) +CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} https://www.ietf.org/ https://analytics.ietf.org/") + # The name of the method to use to invoke the test suite TEST_RUNNER = 'ietf.utils.test_runner.IetfTestRunner' @@ -1010,7 +1010,7 @@ BIBXML_BASE_PATH = '/a/ietfdata/derived/bibxml' TZDATA_ICS_PATH = BASE_DIR + '/../vzic/zoneinfo/' SECR_BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf' -SECR_BLUE_SHEET_URL = '//datatracker.ietf.org/documents/blue_sheet.rtf' +SECR_BLUE_SHEET_URL = IDTRACKER_BASE_URL + '/documents/blue_sheet.rtf' SECR_INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim' SECR_MAX_UPLOAD_SIZE = 40960000 SECR_PROCEEDINGS_DIR = '/a/www/www6s/proceedings/' @@ -1265,4 +1265,4 @@ if SERVER_MODE != 'production': CSRF_COOKIE_SAMESITE = 'Lax' SESSION_COOKIE_SECURE = False SESSION_COOKIE_SAMESITE = 'Lax' - \ No newline at end of file + diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py index 2fbfcf862..784e8dea6 100644 --- a/ietf/settings_sqlitetest.py +++ b/ietf/settings_sqlitetest.py @@ -15,6 +15,9 @@ from ietf.settings import TEST_CODE_COVERAGE_CHECKER, BASE_DIR, PHOTOS_DIRNAME import debug # pyflakes:ignore debug.debug = True +# Use a different hostname, to catch hardcoded values +IDTRACKER_BASE_URL = "https://sqlitetest.ietf.org" + # Workaround to avoid spending minutes stepping through the migrations in # every test run. The result of this is to use the 'syncdb' way of creating # the test database instead of doing it through the migrations. Taken from diff --git a/ietf/templates/401.html b/ietf/templates/401.html index 10fab15b6..a88ce940e 100644 --- a/ietf/templates/401.html +++ b/ietf/templates/401.html @@ -15,10 +15,10 @@

diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html index a1bc93aec..88d904269 100644 --- a/ietf/templates/api/index.html +++ b/ietf/templates/api/index.html @@ -25,7 +25,7 @@

The API top endpoint is at - https://datatracker.ietf.org/api/v1/. + {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.api.views.top_level' %}. The top endpoint lists inferior endpoints, and thus permits some autodiscovery, but there's really no substitute for looking at the actual ORM model classes. @@ -34,7 +34,7 @@

{% endif %} \ No newline at end of file diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html index 009e46a23..08b1fe72e 100644 --- a/ietf/templates/community/manage_list.html +++ b/ietf/templates/community/manage_list.html @@ -61,7 +61,7 @@ Conveniently track individual documents in your personal list with the track icon in - search results. + search results.

You can also add documents here: diff --git a/ietf/templates/community/notification_email.txt b/ietf/templates/community/notification_email.txt index 56a859caa..bd0b0177f 100644 --- a/ietf/templates/community/notification_email.txt +++ b/ietf/templates/community/notification_email.txt @@ -4,7 +4,7 @@ Hello, This is a notification from the {{ clist.long_name }}. Document: {{ event.doc }}, -https://datatracker.ietf.org/doc/{{ event.doc.name }}/ +{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=event.doc.name %} Change by {{ event.by }} on {{ event.time }}: diff --git a/ietf/templates/cookies/settings.html b/ietf/templates/cookies/settings.html index 620a0b6ce..5ded2f3bd 100644 --- a/ietf/templates/cookies/settings.html +++ b/ietf/templates/cookies/settings.html @@ -21,42 +21,42 @@ {% if new_enough == '7' %} active {% endif %}" - href="/accounts/settings/new_enough/7"> + href="{% url 'ietf.cookies.views.new_enough' days=7 %}"> 7 days + href="{% url 'ietf.cookies.views.new_enough' days=14 %}"> 14 days + href="{% url 'ietf.cookies.views.new_enough' days=21 %}"> 21 days + href="{% url 'ietf.cookies.views.new_enough' days=30 %}"> 30 days + href="{% url 'ietf.cookies.views.new_enough' days=60 %}"> 60 days + href="{% url 'ietf.cookies.views.new_enough' days=90 %}"> 90 days

@@ -69,42 +69,42 @@ {% if expires_soon == '7' %} active {% endif %}" - href="/accounts/settings/expires_soon/7"> + href="{% url 'ietf.cookies.views.expires_soon' days=7 %}"> 7 days + href="{% url 'ietf.cookies.views.expires_soon' days=14 %}"> 14 days + href="{% url 'ietf.cookies.views.expires_soon' days=21 %}"> 21 days + href="{% url 'ietf.cookies.views.expires_soon' days=30 %}"> 30 days + href="{% url 'ietf.cookies.views.expires_soon' days=60 %}"> 60 days + href="{% url 'ietf.cookies.views.expires_soon' days=90 %}"> 90 days

@@ -117,14 +117,14 @@ {% if full_draft == 'off' %} active {% endif %}" - href="/accounts/settings/full_draft/off"> + href="{% url 'ietf.cookies.views.full_draft' enabled='off' %}"> Off + href="{% url 'ietf.cookies.views.full_draft' enabled='on' %}"> On

@@ -137,15 +137,15 @@ {% if left_menu == 'off' %} active {% endif %}" - href="/accounts/settings/left_menu/off"> + href="{% url 'ietf.cookies.views.left_menu' enabled='off' %}"> Off + href="{% url 'ietf.cookies.views.left_menu' enabled='on' %}"> On

-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/bofreq/bofreq_template.md b/ietf/templates/doc/bofreq/bofreq_template.md index ba3e2f9d5..c6269d7f4 100644 --- a/ietf/templates/doc/bofreq/bofreq_template.md +++ b/ietf/templates/doc/bofreq/bofreq_template.md @@ -30,9 +30,9 @@ To allow evaluation of your proposal, please include the following items: ## Links to the mailing list, draft charter if any, relevant Internet-Drafts, etc. - Mailing List: https://www.ietf.org/mailman/listinfo/example - - Draft charter: https://datatracker.ietf.org/doc/charter-ietf-EXAMPLE/ + - Draft charter: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='charter-ietf-EXAMPLE' %} - Relevant drafts: - Use Cases: - - https://datatracker.ietf.org/html/draft-blah-uses + - {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='draft-blah-uses' %} - Solutions - - https://datatracker.ietf.org/html/draft-blah-soln \ No newline at end of file + - {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='draft-blah-soln' %} diff --git a/ietf/templates/doc/document_bibtex.bib b/ietf/templates/doc/document_bibtex.bib index 9b511f838..5dda4649e 100644 --- a/ietf/templates/doc/document_bibtex.bib +++ b/ietf/templates/doc/document_bibtex.bib @@ -10,28 +10,28 @@ % actual RFC at https://rfc-editor.org/rfc/rfc{{ doc.rfc_number }}.txt {% endif %} @misc{% templatetag openbrace %}rfc{{ doc.rfc_number }}, - series = {Request for Comments}, - number = {{ doc.rfc_number }}, - howpublished = {% templatetag openbrace %}RFC {{ doc.rfc_number }}{% if doc.doc.intended_std_level %} ({{ doc.intended_std_level }}){% endif %}{% templatetag closebrace %}, - publisher = {RFC Editor}, - doi = {% templatetag openbrace %}{{ doi }}{% templatetag closebrace %}, - url = {% templatetag openbrace %}{{ doc.rfc_number|rfceditor_info_url }}{% templatetag closebrace %},{% else %} + series = {Request for Comments}, + number = {{ doc.rfc_number }}, + howpublished = {% templatetag openbrace %}RFC {{ doc.rfc_number }}{% if doc.doc.intended_std_level %} ({{ doc.intended_std_level }}){% endif %}{% templatetag closebrace %}, + publisher = {RFC Editor}, + doi = {% templatetag openbrace %}{{ doi }}{% templatetag closebrace %}, + url = {% templatetag openbrace %}{{ doc.rfc_number|rfceditor_info_url }}{% templatetag closebrace %},{% else %} {% if published %}%% You should probably cite rfc{{ latest_revision.doc.rfc_number }} instead of this I-D.{% else %}{% if replaced_by %}%% You should probably cite {{replaced_by|join:" or "}} instead of this I-D.{% else %} {% if doc.rev != latest_revision.rev %}%% You should probably cite {{latest_revision.doc.name}}-{{latest_revision.rev}} instead of this revision.{%endif%}{% endif %}{% endif %} @techreport{% templatetag openbrace %}{{doc.name|slice:"6:"}}-{{doc.rev}}, - number = {% templatetag openbrace %}{{doc.name}}-{{doc.rev}}{% templatetag closebrace %}, - type = {% templatetag openbrace %}Internet-Draft{% templatetag closebrace %}, - institution = {% templatetag openbrace %}Internet Engineering Task Force{% templatetag closebrace %}, - publisher = {% templatetag openbrace %}Internet Engineering Task Force{% templatetag closebrace %}, - note = {% templatetag openbrace %}Work in Progress{% templatetag closebrace %}, - url = {% templatetag openbrace %}https://datatracker.ietf.org/doc/html/{{doc.name}}-{{doc.rev}}{% templatetag closebrace %},{% endif %} - author = {% templatetag openbrace %}{% for author in doc.documentauthor_set.all %}{{ author.person.name|texescape}}{% if not forloop.last %} and {% endif %}{% endfor %}{% templatetag closebrace %}, - title = {% templatetag openbrace %}{% templatetag openbrace %}{{doc.title|texescape}}{% templatetag closebrace %}{% templatetag closebrace %}, - pagetotal = {{ doc.pages }}, - year = {{ doc.pub_date.year }}, - month = {{ doc.pub_date|date:"b" }},{% if not doc.rfc_number or doc.pub_date.day == 1 and doc.pub_date.month == 4 %} - day = {{ doc.pub_date.day }},{% endif %} - abstract = {% templatetag openbrace %}{{ doc.abstract|clean_whitespace|texescape }}{% templatetag closebrace %}, + number = {% templatetag openbrace %}{{doc.name}}-{{doc.rev}}{% templatetag closebrace %}, + type = {% templatetag openbrace %}Internet-Draft{% templatetag closebrace %}, + institution = {% templatetag openbrace %}Internet Engineering Task Force{% templatetag closebrace %}, + publisher = {% templatetag openbrace %}Internet Engineering Task Force{% templatetag closebrace %}, + note = {% templatetag openbrace %}Work in Progress{% templatetag closebrace %}, + url = {% templatetag openbrace %}{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=doc.name rev=doc.rev %}{% templatetag closebrace %},{% endif %} + author = {% templatetag openbrace %}{% for author in doc.documentauthor_set.all %}{{ author.person.name|texescape}}{% if not forloop.last %} and {% endif %}{% endfor %}{% templatetag closebrace %}, + title = {% templatetag openbrace %}{% templatetag openbrace %}{{doc.title|texescape}}{% templatetag closebrace %}{% templatetag closebrace %}, + pagetotal = {{ doc.pages }}, + year = {{ doc.pub_date.year }}, + month = {{ doc.pub_date|date:"b" }},{% if not doc.rfc_number or doc.pub_date.day == 1 and doc.pub_date.month == 4 %} + day = {{ doc.pub_date.day }},{% endif %} + abstract = {% templatetag openbrace %}{{ doc.abstract|clean_whitespace|texescape }}{% templatetag closebrace %}, {% templatetag closebrace %} {% endautoescape %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index a1674c482..22016ab50 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -74,7 +74,7 @@ {% if draft_name %}
Was - {{ draft_name }} + {{ draft_name }} {% if submission %}({{ submission|safe }}){% endif %}
{% endif %} @@ -1188,4 +1188,4 @@ - {% endblock %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html index cab0ee1b3..8d561b1c7 100644 --- a/ietf/templates/doc/index_active_drafts.html +++ b/ietf/templates/doc/index_active_drafts.html @@ -38,7 +38,7 @@ {{ a }}{% if not forloop.last %}, {% else %}.{% endif %} {% endfor %}
- {{ d.name }}-{{ d.rev }} + {{ d.name }}-{{ d.rev }}
{{ d.rev_time|date:"Y-m-d" }} diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html index 9f97101ff..8ebf004a0 100644 --- a/ietf/templates/group/customize_workflow.html +++ b/ietf/templates/group/customize_workflow.html @@ -24,7 +24,7 @@

You can see the default Working Group I-D State Diagram in - Section 4.1 of RFC6174. + Section 4.1 of RFC6174.

{% endif %}

States

diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html index fcf0b6dac..4087ebfe8 100644 --- a/ietf/templates/group/index.html +++ b/ietf/templates/group/index.html @@ -21,7 +21,7 @@ {% for stream in streams %} - {{ stream.acronym }} + {{ stream.acronym }} {{ stream.name }} @@ -37,4 +37,4 @@ {% endblock %} {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/help/personal-information.html b/ietf/templates/help/personal-information.html index 8676472de..d60ee93b6 100644 --- a/ietf/templates/help/personal-information.html +++ b/ietf/templates/help/personal-information.html @@ -69,7 +69,7 @@

Most of this information can be edited on the individual's - Account Info + Account Info page by the individual after logging in to the account. If the datatracker holds such information about a person, and they don't have an account, a request to diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index 84aaaf941..ceb84199c 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -49,7 +49,7 @@ {% for ipr in conflictdoc.ipr %} {% if ipr.disclosure.state_id == "posted" %}

- {{ ipr.disclosure.title }} + {{ ipr.disclosure.title }}
{% endif %} {% endfor %} diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html index 5c5032380..16b223186 100644 --- a/ietf/templates/iesg/agenda_doc.html +++ b/ietf/templates/iesg/agenda_doc.html @@ -87,7 +87,7 @@ {% for ipr in doc.ipr %} {% if ipr.disclosure.state_id == "posted" %}
- {{ ipr.disclosure.title }} + {{ ipr.disclosure.title }}
{% endif %} {% endfor %} diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html index be0110893..1935c44e0 100644 --- a/ietf/templates/iesg/agenda_documents.html +++ b/ietf/templates/iesg/agenda_documents.html @@ -24,13 +24,13 @@ {{ t.pages }} page{{ t.pages|pluralize }}
- + Full IESG agenda + href="{% url 'ietf.iesg.views.telechat_docs_tarfile' date=t.date %}"> Download documents diff --git a/ietf/templates/iesg/agenda_package.txt b/ietf/templates/iesg/agenda_package.txt index d4d6c0bad..ad95c39d3 100644 --- a/ietf/templates/iesg/agenda_package.txt +++ b/ietf/templates/iesg/agenda_package.txt @@ -5,9 +5,9 @@ Contents: 1. Roll Call and Dial-In Instructions {{ roll_call_url }} 2. Agenda - https://datatracker.ietf.org/iesg/agenda/ + {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.iesg.views.agenda' %} 3. Management Item Details - https://datatracker.ietf.org/iesg/agenda/#6 + {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.iesg.views.agenda' %}#6 4. Previous minutes {{ minutes_url }} diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html index 1b508bf25..2dc51bc7e 100644 --- a/ietf/templates/ipr/details_edit.html +++ b/ietf/templates/ipr/details_edit.html @@ -32,7 +32,7 @@ regarding an IETF document or contribution when the person letting the IETF know about the patent has no relationship with the patent owners. Click - here + here if you want to disclose information about patents or patent applications where you do have a relationship to the patent owners or patent applicants. diff --git a/ietf/templates/ipr/new_update_email.txt b/ietf/templates/ipr/new_update_email.txt index 9e95414db..66285493e 100644 --- a/ietf/templates/ipr/new_update_email.txt +++ b/ietf/templates/ipr/new_update_email.txt @@ -1,6 +1,6 @@ {% autoescape off %}A new IPR disclosure has been submitted. Please check it and post it. -https://datatracker.ietf.org/ipr/admin/pending/ +{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.ipr.views.admin" state='pending' %} {% include "ipr/details.txt" %} {% endautoescape %} diff --git a/ietf/templates/ipr/posted_document_email.txt b/ietf/templates/ipr/posted_document_email.txt index c612a00ef..397b686b2 100644 --- a/ietf/templates/ipr/posted_document_email.txt +++ b/ietf/templates/ipr/posted_document_email.txt @@ -6,7 +6,7 @@ Cc: {{ cc_email }} Dear {{ to_name }}: {% filter wordwrap:78 %} -An IPR disclosure that pertains to your {{ doc_info }} was submitted to the IETF Secretariat on {{ ipr.get_latest_event_submitted.time|date:"Y-m-d" }} and has been posted on the "IETF Page of Intellectual Property Rights Disclosures" (https://datatracker.ietf.org/ipr/{{ ipr.pk }}/). The title of the IPR disclosure is "{{ ipr.title }}" +An IPR disclosure that pertains to your {{ doc_info }} was submitted to the IETF Secretariat on {{ ipr.get_latest_event_submitted.time|date:"Y-m-d" }} and has been posted on the "IETF Page of Intellectual Property Rights Disclosures" ({{ settings.IDTRACKER_BASE_URL }}{% url "ietf.ipr.views.history" id=ipr.pk %}). The title of the IPR disclosure is "{{ ipr.title }}" {% endfilter %} Thank you diff --git a/ietf/templates/ipr/posted_generic_email.txt b/ietf/templates/ipr/posted_generic_email.txt index f3c0ae6b0..0159c5b25 100644 --- a/ietf/templates/ipr/posted_generic_email.txt +++ b/ietf/templates/ipr/posted_generic_email.txt @@ -7,7 +7,7 @@ Dear {{ to_name }}: A generic IPR disclosure was submitted to the IETF Secretariat on {{ ipr.get_latest_event_submitted.time|date:"Y-m-d" }} and has been posted on the "IETF Page of Intellectual Property Rights Disclosures" -(https://datatracker.ietf.org/ipr/). The title of the IPR disclosure is +({{ settings.IDTRACKER_BASE_URL }}{% url "ietf.ipr.views.showlist" %}). The title of the IPR disclosure is {{ ipr.title }}. Thank you diff --git a/ietf/templates/ipr/posted_submitter_email.txt b/ietf/templates/ipr/posted_submitter_email.txt index a473c61aa..09fe73f16 100644 --- a/ietf/templates/ipr/posted_submitter_email.txt +++ b/ietf/templates/ipr/posted_submitter_email.txt @@ -7,7 +7,7 @@ Dear {{ to_name }}: Your IPR disclosure entitled {{ ipr.title }} has been posted on the "IETF Page of Intellectual Property Rights Disclosures" -(https://datatracker.ietf.org/ipr/).{% if ipr.updates %} +({{ settings.IDTRACKER_BASE_URL }}{% url "ietf.ipr.views.showlist" %}).{% if ipr.updates %} Your IPR disclosure updates: {% for rel in ipr.updates %} diff --git a/ietf/templates/liaisons/field_help.html b/ietf/templates/liaisons/field_help.html index 7d5b755ba..1a2485c22 100644 --- a/ietf/templates/liaisons/field_help.html +++ b/ietf/templates/liaisons/field_help.html @@ -25,7 +25,7 @@ Liaison statements from the IETF: guidelines for completing the "Cc:" field
  • - Active IETF working groups + Active IETF working groups
  • IETF liaison managers diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html index 953f9f416..53568d1a4 100644 --- a/ietf/templates/liaisons/guide_from_ietf.html +++ b/ietf/templates/liaisons/guide_from_ietf.html @@ -85,7 +85,7 @@ The IETF Liaison Manager for the SDO (4)
    - The IETF Area Director(s) + The IETF Area Director(s) (if not the submitter)
    The IETF Chair <chair@ietf.org> @@ -100,12 +100,12 @@ The IETF Liaison Manager for the SDO (4)
    - The IETF Working Group Chair(s) + The IETF Working Group Chair(s) (if not the submitter)
    - The IETF Area Director(s) + The IETF Area Director(s)
    - The IETF Working Group Discussion List + The IETF Working Group Discussion List diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html index a0bbed0f2..4ff53dd6f 100644 --- a/ietf/templates/liaisons/guide_to_ietf.html +++ b/ietf/templates/liaisons/guide_to_ietf.html @@ -62,7 +62,7 @@ An IETF Area - The IETF Area Director(s) + The IETF Area Director(s) The IETF Liaison Manager for the SDO @@ -75,14 +75,14 @@ An IETF Working Group - The Working Group Chair(s) + The Working Group Chair(s) The IETF Liaison Manager for the SDO
    - The IETF Area Director(s) + The IETF Area Director(s)
    - The IETF Working Group Discussion List + The IETF Working Group Discussion List diff --git a/ietf/templates/meeting/interim_minutes_reminder.txt b/ietf/templates/meeting/interim_minutes_reminder.txt index 1cd984786..fd3b4d918 100644 --- a/ietf/templates/meeting/interim_minutes_reminder.txt +++ b/ietf/templates/meeting/interim_minutes_reminder.txt @@ -9,7 +9,7 @@ be provided within 10 days of the event. At your earliest convenience, please upload meeting minutes, as well as any presentations from your sessions by using the Meeting Materials Manager found here: -https://datatracker.ietf.org/secr/proceedings/. +{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.secr.proceedings.views.main'/secr/proceedings/. Alternatively, you are welcome to send them to proceedings@ietf.org for manual posting. diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html index 926769dfc..57924b5e3 100644 --- a/ietf/templates/meeting/interim_session_buttons.html +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -18,14 +18,14 @@ {# materials tar file #} {# materials PDF file #} @@ -157,4 +157,4 @@ {% endwith %} {% endif %}
    • -{% endwith %} +{% endwith %} \ No newline at end of file diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html index efd0afde3..c11744baf 100644 --- a/ietf/templates/meeting/materials.html +++ b/ietf/templates/meeting/materials.html @@ -32,7 +32,7 @@ {% endif %} {% endif %} - Meeting requests/conflicts + Meeting requests/conflicts

    {% include 'meeting/proceedings/materials_table.html' with meeting=meeting proceedings_materials=proceedings_materials user=user only %} {% with "True" as show_agenda %} diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html index fb7afcbcd..dbd706270 100644 --- a/ietf/templates/meeting/session_buttons_include.html +++ b/ietf/templates/meeting/session_buttons_include.html @@ -29,7 +29,7 @@ {# materials tar file #} @@ -37,7 +37,7 @@ {# materials PDF file #} @@ -219,14 +219,14 @@ {# materials tar file #}
  • + href="{% url 'ietf.meeting.views.session_draft_tarfile' num=meeting.number acronym=acronym %}"> Meeting materials archive
    • {# materials PDF file #}
  • + href="{% url 'ietf.meeting.views.session_draft_pdf' num=meeting.number acronym=acronym %}"> Meeting materials PDF
    • diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html index 9ce563230..e1de22e66 100644 --- a/ietf/templates/registration/change_password.html +++ b/ietf/templates/registration/change_password.html @@ -19,7 +19,7 @@ {% if not user.is_authenticated %} Sign in {% endif %} {% else %} diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html index 97def1eda..d6d83dba3 100644 --- a/ietf/templates/registration/edit_profile.html +++ b/ietf/templates/registration/edit_profile.html @@ -28,7 +28,7 @@

    {{ user.username }}

    - Edit + Edit
    @@ -39,7 +39,7 @@
    - Change password + Change password
    {% if person.photo %} @@ -196,7 +196,7 @@ covering IETF's Legitimate Interest due to the IETF's mission of developing standards for the internet. See also the page on - + handling of personal information . @@ -271,4 +271,4 @@ }); -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/registration/index.html b/ietf/templates/registration/index.html index 0cf3222fd..6f638cd25 100644 --- a/ietf/templates/registration/index.html +++ b/ietf/templates/registration/index.html @@ -7,15 +7,15 @@

    Account management

    {% if user.username %} - View/edit profile + View/edit profile {% else %} Sign in {% endif %} - New account - Reset password - Change browser preferences + New account + Reset password + Change browser preferences
    {% endblock %} \ No newline at end of file diff --git a/ietf/templates/registration/logged_out.html b/ietf/templates/registration/logged_out.html index 6667b6d2b..30113943b 100644 --- a/ietf/templates/registration/logged_out.html +++ b/ietf/templates/registration/logged_out.html @@ -5,7 +5,7 @@ {% block content %} {% origin %}

    You have been signed out

    - Sign in + Sign in {% endblock %} {% block js %} {% if request.META.HTTP_REFERER %} diff --git a/ietf/templates/release/about.html b/ietf/templates/release/about.html index cc93192e6..536658012 100644 --- a/ietf/templates/release/about.html +++ b/ietf/templates/release/about.html @@ -106,4 +106,4 @@ of it and its capabilities was made 2002-11-20 in Atlanta by Thomas Narten.

    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/announce_new_version.txt b/ietf/templates/submit/announce_new_version.txt index 4f6c53814..0398cf53d 100644 --- a/ietf/templates/submit/announce_new_version.txt +++ b/ietf/templates/submit/announce_new_version.txt @@ -7,7 +7,7 @@ A new version (-{{ submission.rev }}) has been submitted for {{ submission.name {% endif %} The IETF datatracker page for this Internet-Draft is: -https://datatracker.ietf.org/doc/{{ submission.name }}/ +{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %} Diff from previous version: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }} diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt index bfa6e0f65..7622cb969 100644 --- a/ietf/templates/submit/announce_to_authors.txt +++ b/ietf/templates/submit/announce_to_authors.txt @@ -10,9 +10,9 @@ Document date: {{ submission.document_date|date:"Y-m-d" }} 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" %} +Status: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %} Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %} -Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }} +Htmlized: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %} {% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} Abstract: diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt index b0986fe52..b291da702 100644 --- a/ietf/templates/submit/announce_to_lists.txt +++ b/ietf/templates/submit/announce_to_lists.txt @@ -5,20 +5,20 @@ A New Internet-Draft is available from the on-line Internet-Drafts directories. Title : {{ submission.title }} Author{{ submission.authors|pluralize:" ,s" }} : {% for author in submission.authors %}{{ author.name }}{% if not forloop.last %} {% endif %}{% endfor %} - Filename : {{ submission.name }}-{{ submission.rev }}.txt - Pages : {{ submission.pages }} - Date : {{ submission.submission_date|date:"Y-m-d" }} + Filename : {{ submission.name }}-{{ submission.rev }}.txt + Pages : {{ submission.pages }} + Date : {{ submission.submission_date|date:"Y-m-d" }} Abstract: {{ submission.abstract }} The IETF datatracker status page for this draft is: -https://datatracker.ietf.org/doc/{{ submission.name }}/ +{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=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 is also an htmlized version available at: -https://datatracker.ietf.org/doc/html/{{ submission.name }}-{{ submission.rev }}{% endif %} +{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name rev=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 }} diff --git a/ietf/templates/submit/api_submit_info.html b/ietf/templates/submit/api_submit_info.html index e873e26af..a94f85520 100644 --- a/ietf/templates/submit/api_submit_info.html +++ b/ietf/templates/submit/api_submit_info.html @@ -44,7 +44,7 @@ Here is an example: 

    -$ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" https://datatracker.ietf.org/api/submit
+$ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.submit.views.api_submit' %}
 Upload of draft-user-example OK, confirmation requests sent to:
 User Name <user.name@example.com>
    {% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html index fd63ce1f9..6a1b2a126 100644 --- a/ietf/templates/submit/tool_instructions.html +++ b/ietf/templates/submit/tool_instructions.html @@ -8,7 +8,7 @@

    Tool URL: - https://datatracker.ietf.org{% url "ietf.submit.views.upload_submission" %} + {{ settings.IDTRACKER_BASE_URL }}{% url "ietf.submit.views.upload_submission" %}

    @@ -30,7 +30,7 @@

    An API for automated draft submission is available as an alternative to this webpage at - https://datatracker.ietf.org/api/submit/. + {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.submit.views.api_submit' %}.

    The specification for this tool can be found in diff --git a/ietf/templates/utils/merge_person_records.txt b/ietf/templates/utils/merge_person_records.txt index 69c8e7bdd..594811023 100644 --- a/ietf/templates/utils/merge_person_records.txt +++ b/ietf/templates/utils/merge_person_records.txt @@ -16,7 +16,7 @@ Emails: {% if changes %}Changes of special note: {{ changes }}{% endif %} -You can make changes to your profile here: https://datatracker.ietf.org/accounts/profile/ +You can make changes to your profile here: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.ietfauth.views.profile' %} Reply to this message if this merge should not have happened, or if it produced an incorrect result that you cannot correct by editing your profile. diff --git a/ietf/templates/utils/personal_information_notice.txt b/ietf/templates/utils/personal_information_notice.txt index 609f95343..379d8e4ef 100644 --- a/ietf/templates/utils/personal_information_notice.txt +++ b/ietf/templates/utils/personal_information_notice.txt @@ -19,7 +19,7 @@ continued maintenance and use of your information by checking the 'Consent' checkbox found at the bottom of the page, and then submit the form. For information on how personal information is handled in the datatracker, please see -{{ settings.IDTRACKER_BASE_URL }}/help/personal-information. +{{ settings.IDTRACKER_BASE_URL }}{% url 'personal-information' %}. In case you prefer to not follow any email links, due to phishing considerations, please just go to the datatracker and use the menu