diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py index cf5b35ccd..44287a6ef 100644 --- a/ietf/doc/tests_review.py +++ b/ietf/doc/tests_review.py @@ -173,7 +173,12 @@ class ReviewTests(TestCase): r = self.client.get(url) self.assertContains(r, review_req.team.acronym) self.assertContains(r, review_req.team.name) - self.assertContains(r, author.name) + try: + # FIXME-LARS + self.assertContains(r, author.name) + except: + print(r.content) + self.assertContains(r, author.name) url = urlreverse('ietf.doc.views_review.review_request_forced_login', kwargs={ "name": doc.name, "request_id": review_req.pk }) r = self.client.get(url) diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html index d548339bf..63820bc1a 100644 --- a/ietf/templates/api/index.html +++ b/ietf/templates/api/index.html @@ -42,8 +42,8 @@

The API top endpoint is at - https://datatracker.ietf.org/api/v1/ - . The top + https://datatracker.ietf.org/api/v1/. + 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. Comparing a class in models.py with the equivalent endpoint may give @@ -66,8 +66,7 @@

Framework API: Documents

Documents are listed at - /api/v1/doc/document/ - . + /api/v1/doc/document/.

In general, individual database objects are represented in the API with a path @@ -156,13 +155,11 @@ $ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains {% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %} - - . + . You can also specify an RFC: {% url 'ietf.doc.views_doc.document_json' name='rfc2026' %} - - . + . No API key is needed to access this.

@@ -253,8 +250,8 @@ $ curl -S -F "apikey=DgAAAMLSi3coaE5TjrRs518xO8eBRlCmFF3eQcC8_SjUTtRGLGiJh7-1SYP

OpenID Connect

The datatracker supports - OpenID Connect - , but + OpenID Connect, + but not dynamic registration. The OpenID Connect Issuer is {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.api.urls.oidc_issuer' %}

@@ -277,8 +274,7 @@ $ curl -S -F "apikey=DgAAAMLSi3coaE5TjrRs518xO8eBRlCmFF3eQcC8_SjUTtRGLGiJh7-1SYP {% url 'ietf.doc.views_ballot.api_set_position' %} above - - . + . Personal API keys are available from your Account API Keys @@ -316,8 +312,8 @@ $ curl -S -F "apikey=DgAAAMLSi3coaE5TjrRs518xO8eBRlCmFF3eQcC8_SjUTtRGLGiJh7-1SYP RFC 7515: JSON Web Signature (JWS) - - , using a public/private keypair with + , + using a public/private keypair with this public key:

diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html index 930bb6a4c..929d7ab2f 100644 --- a/ietf/templates/community/manage_list.html +++ b/ietf/templates/community/manage_list.html @@ -16,8 +16,7 @@ {% bootstrap_messages %}

The list currently tracks - {{ total_count }} document{{ total_count|pluralize }} - . + {{ total_count }} document{{ total_count|pluralize }}.

Back to list @@ -61,8 +60,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/subscription.html b/ietf/templates/community/subscription.html index 749b37422..2644b77bf 100644 --- a/ietf/templates/community/subscription.html +++ b/ietf/templates/community/subscription.html @@ -35,8 +35,7 @@

Add new subscription

The email addresses you can choose between are those registered in - your profile - . + your profile.

{% if form.fields.email.queryset %}
diff --git a/ietf/templates/doc/bofreq/new_bofreq.html b/ietf/templates/doc/bofreq/new_bofreq.html index 4d3dc8f5c..96f08aa87 100644 --- a/ietf/templates/doc/bofreq/new_bofreq.html +++ b/ietf/templates/doc/bofreq/new_bofreq.html @@ -10,7 +10,7 @@ Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content. The title can be changed later, but the filename will not change.

- For example, a request with a title of "A new important bit" will be saved as "bofreq-a-new-important-bit-00.md". + For example, a request with a title of "A new important bit" will be saved as bofreq-a-new-important-bit-00.md.

The shepherd needs to have a Datatracker account. A new account can be - created here - . + created here.

{% csrf_token %} diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index ce2299a44..07334cf6c 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -28,9 +28,7 @@ {% if group.parent and group.parent.type_id == "area" %} {{ group.parent.type.name }} - {{ group.parent.name }} ( - {{ group.parent.acronym }} - ) + {{ group.parent.name }} ({{ group.parent.acronym }}) {% else %} diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html index 5e5e86a55..10f6cf73f 100644 --- a/ietf/templates/doc/document_material.html +++ b/ietf/templates/doc/document_material.html @@ -65,8 +65,7 @@ {% for t, url in other_types %} - {{ t }} - {% if not forloop.last %},{% endif %} + {{ t }}{% if not forloop.last %},{% endif %} {% endfor %} @@ -130,8 +129,7 @@ {% else %} Not available as plain text. {% if other_types %} - Download as {{ other_types.0.0.upper }} - . + Download as {{ other_types.0.0.upper }}. {% endif %} {% endif %} diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html index 9ebcf32a7..659e4ae44 100644 --- a/ietf/templates/doc/draft/request_publication.html +++ b/ietf/templates/doc/draft/request_publication.html @@ -15,8 +15,7 @@ Send a publication request to the RFC Editor for {{ doc }} and move it to the {{ next_state.name }} stream state. Please edit the message and remove any parts in brackets you do not fill in. For independent submissions, see the - guidelines - . + guidelines.

{% if not doc.intended_std_level %}

diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html index 4e2d0fd67..039cef0bd 100644 --- a/ietf/templates/doc/frontpage.html +++ b/ietf/templates/doc/frontpage.html @@ -29,8 +29,7 @@

The primary public face of the IETF is at - www.ietf.org - . + www.ietf.org.

diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html index 992dca9d7..a0424485c 100644 --- a/ietf/templates/doc/index_active_drafts.html +++ b/ietf/templates/doc/index_active_drafts.html @@ -12,8 +12,7 @@

This page lists all active Internet-Drafts, grouped by responsible group. For normal use, it is recommended to use the - search page - . + search page.

There is also an diff --git a/ietf/templates/doc/index_all_drafts.html b/ietf/templates/doc/index_all_drafts.html index b080f6d9f..ebcd9b15e 100644 --- a/ietf/templates/doc/index_all_drafts.html +++ b/ietf/templates/doc/index_all_drafts.html @@ -13,8 +13,7 @@ search page - - . + .

There is also an @@ -35,8 +34,7 @@ Active Internet-Drafts with abstracts (text)

  • - All Internet-Drafts (tab-separated) - , + All Internet-Drafts (tab-separated), older version (with fewer fields)
  • diff --git a/ietf/templates/doc/material/edit_material.html b/ietf/templates/doc/material/edit_material.html index 6efba40b7..f2f6fdfa1 100644 --- a/ietf/templates/doc/material/edit_material.html +++ b/ietf/templates/doc/material/edit_material.html @@ -39,8 +39,7 @@

    {% if group is not None %} Below you can upload a document for the group {{ group.name }} - ({{ group.acronym }}) - . + ({{ group.acronym }}). The document will appear under the materials tab in the group pages. {% elif doc.meeting_related %} Below you can upload a document for the {{ doc.get_related_meeting }} meeting. @@ -50,8 +49,7 @@

    {% if group is not None %} Below you can upload a new revision of {{ doc_name }} for the group {{ group.name }} - ({{ group.acronym }}) - . + ({{ group.acronym }}). {% elif doc.meeting_related %} Below you can upload a new revision of {{ doc_name }} for the {{ doc.get_related_meeting }} meeting. {% endif %} diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html index 8afecccaa..5cf08c2af 100644 --- a/ietf/templates/doc/review/complete_review.html +++ b/ietf/templates/doc/review/complete_review.html @@ -120,14 +120,9 @@ You have to fill in link and content yourself.

    • diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html index d37a4e468..4ffc6392f 100644 --- a/ietf/templates/doc/review/request_info.html +++ b/ietf/templates/doc/review/request_info.html @@ -46,11 +46,9 @@ {% else %} {{ doc.group.name }} {% endif %} - ( - + ( {{ review_req.team.acronym }} - - ) + ) @@ -144,11 +142,7 @@ {{ a.review_request.team.acronym|capfirst }} {{ a.review_request.type.name }} review of -{{ a.reviewed_rev|default:"??" }} by {% person_link a.reviewer.person %} {% endif %} {% if a.reviewed_rev and a.reviewed_rev != a.review_request.doc.rev %} - ( - - diff - - ) + (diff) {% endif %}
    {% endfor %} diff --git a/ietf/templates/googlea30ad1dacffb5e5b.html b/ietf/templates/googlea30ad1dacffb5e5b.html index 72f4902fa..b41526290 100644 --- a/ietf/templates/googlea30ad1dacffb5e5b.html +++ b/ietf/templates/googlea30ad1dacffb5e5b.html @@ -6,8 +6,7 @@

    This is a verification page for the - Google Webmaster Tools - . + Google Webmaster Tools.

    \ No newline at end of file diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html index 4554eaf58..bd7f205b4 100644 --- a/ietf/templates/group/customize_workflow.html +++ b/ietf/templates/group/customize_workflow.html @@ -17,16 +17,15 @@

    Below you can customize the draft states and tags used in the - {{ group.acronym }} {{ group.type.name }} - . Note that some states are + {{ group.acronym }} {{ group.type.name }}. + Note that some states are mandatory for group operation and cannot be deactivated.

    {% if group.type_id == "wg" %}

    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/group_about_status.html b/ietf/templates/group/group_about_status.html index 73dc7d81d..352ebc3d2 100644 --- a/ietf/templates/group/group_about_status.html +++ b/ietf/templates/group/group_about_status.html @@ -19,14 +19,13 @@

    About Status Updates

    Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was added to address the IESG request at - ticket 1773 - . Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see + ticket 1773. + Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see the Kitten report sent to SAAG for IETF94 or the - Routing area high level summaries for IETF94 - . + Routing area high level summaries for IETF94.

    {% endif %} diff --git a/ietf/templates/group/group_about_status_edit.html b/ietf/templates/group/group_about_status_edit.html index c298e1d8b..dcb7b7d53 100644 --- a/ietf/templates/group/group_about_status_edit.html +++ b/ietf/templates/group/group_about_status_edit.html @@ -15,14 +15,13 @@

    About Status Updates

    Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was added to address the IESG request at - ticket 1773 - . Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see + ticket 1773. + Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see the Kitten report sent to SAAG for IETF94 or the - Routing area high level summaries for IETF94 - . + Routing area high level summaries for IETF94.

    diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html index ab00b3c1a..cf8c79937 100644 --- a/ietf/templates/group/manage_review_requests.html +++ b/ietf/templates/group/manage_review_requests.html @@ -101,11 +101,7 @@ -{{ alatest.reviewed_rev }} {% if alatest.reviewed_rev != r.doc.rev %} - ( - - diff - - ) + (diff) {% endif %} : diff --git a/ietf/templates/help/personal-information.html b/ietf/templates/help/personal-information.html index ee809ada4..4f1611cba 100644 --- a/ietf/templates/help/personal-information.html +++ b/ietf/templates/help/personal-information.html @@ -42,8 +42,7 @@ 6(1) f) of EU's General Data Protection Regulation - - . + .

    The datatracker treats all personal information derived from draft documents and diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html index a530e198d..b7d31a822 100644 --- a/ietf/templates/ipr/details_view.html +++ b/ietf/templates/ipr/details_view.html @@ -56,23 +56,22 @@

    This IPR disclosure does not comply with the formal requirements of Section 5, "IPR Disclosures," of - RFC 8179 - , "Intellectual Property Rights in IETF Technology." + RFC 8179, + "Intellectual Property Rights in IETF Technology."

    {% else %}

    This IPR disclosure does not comply with the formal requirements of Section 6, "IPR Disclosures," of - RFC 3979 - , "Intellectual Property Rights in IETF Technology." + RFC 3979, + "Intellectual Property Rights in IETF Technology."

    {% endif %} {% endif %} {% if ipr.has_legacy_event %}

    The text of the original IPR disclosure is available in the - disclosure history - . + disclosure history.

    {% endif %}
    @@ -107,9 +106,7 @@ {% if item.source.state.slug == "removed" %} "{{ item.source.title }}" (which was removed at the request of the submitter) {% else %} - " - {{ item.source.title }} - " + "{{ item.source.title }}" {% endif %}
    {% endfor %} @@ -132,9 +129,7 @@ {% elif item.target.state.slug == "parked" %} "{{ item.target.title }}" {% else %} - " - {{ item.target.title }} - " + "{{ item.target.title }}" {% endif %} {% endfor %} @@ -158,9 +153,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - #{{ prev.id }} - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -188,9 +181,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - #{{ prev.id }} - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -245,11 +236,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -309,11 +296,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -397,11 +380,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -439,11 +418,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -501,11 +476,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -568,11 +539,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -609,11 +576,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} @@ -661,11 +624,7 @@ {% if prev.state.slug == "posted" %} - Previous ( - - #{{ prev.id }} - - ) + Previous (#{{ prev.id }}) {% else %} Previous (#{{ prev.id }}, {{ prev.state }}) {% endif %} diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html index 3305b693b..d32f32e03 100644 --- a/ietf/templates/liaisons/edit.html +++ b/ietf/templates/liaisons/edit.html @@ -40,8 +40,7 @@ Fields marked with are required. For detailed descriptions of the fields see the - field help - . + field help.

    {% endif %} (2) The IETF Secretariat, <statements@ietf.org> - - , is automatically blind-copied on every liaison statement sent by the IETF. + , + is automatically blind-copied on every liaison statement sent by the IETF.

    (3) Any addresses included in the "Response Contact" and "Technical Contact" fields of a liaison statement will also receive copies of the liaison statement. diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html index 741a67334..5e6a18fe4 100644 --- a/ietf/templates/liaisons/guide_to_ietf.html +++ b/ietf/templates/liaisons/guide_to_ietf.html @@ -88,8 +88,8 @@

    (1) The - IETF Secretariat <statements@ietf.org> - , is automatically blind-copied on every liaison statement sent to the IETF. + IETF Secretariat <statements@ietf.org>, + is automatically blind-copied on every liaison statement sent to the IETF.

    (2) Any addresses included in the "response contact" and @@ -102,4 +102,4 @@ {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html index 06662d46e..f453a2755 100644 --- a/ietf/templates/meeting/edit_meeting_schedule.html +++ b/ietf/templates/meeting/edit_meeting_schedule.html @@ -63,8 +63,7 @@ Make a new agenda from this - - . + . {% endif %}

    @@ -420,4 +419,4 @@
    - {% endblock %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/important-dates.html b/ietf/templates/meeting/important-dates.html index 9b87fdcac..f4aed70e3 100644 --- a/ietf/templates/meeting/important-dates.html +++ b/ietf/templates/meeting/important-dates.html @@ -45,13 +45,11 @@ {{ d.name.desc|linkify|urlize_ietf_docs }} {% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %} - Register here - . + Register here. {% endif %} {% if d.name.slug == 'opensched' %} To request a Working Group session, use the - IETF Meeting Session Request Tool - . + IETF Meeting Session Request Tool. If you are working on a BOF request, it is highly recommended to tell the IESG now by sending an email to iesg@ietf.org @@ -59,23 +57,19 @@ {% endif %} {% if d.name.slug == 'cutoffwgreq' %} To request a Working Group session, use the - IETF Meeting Session Request Tool - . + IETF Meeting Session Request Tool. {% endif %} {% if d.name.slug == 'cutoffbofreq' %} To request a BOF, please see instructions on - Requesting a BOF - . + Requesting a BOF. {% endif %} {% if d.name.slug == 'idcutoff' %} Upload using the - ID Submission Tool - . + ID Submission Tool. {% endif %} {% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %} Upload using the - Meeting Materials Management Tool - . + Meeting Materials Management Tool. {% endif %} diff --git a/ietf/templates/meeting/materials_upload_closed.html b/ietf/templates/meeting/materials_upload_closed.html index 4624ac4c9..352fd870f 100644 --- a/ietf/templates/meeting/materials_upload_closed.html +++ b/ietf/templates/meeting/materials_upload_closed.html @@ -18,7 +18,6 @@

    You should be able to access the final version of IETF {{ meeting_num }} Proceedings via the - IETF Online Proceedings page - . + IETF Online Proceedings page.

    {% endblock %} \ No newline at end of file diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html index 0d0b77eb3..2c98c2e3c 100644 --- a/ietf/templates/person/profile.html +++ b/ietf/templates/person/profile.html @@ -46,9 +46,7 @@ {{ role.name.name }} {{ role.group.name }} - ( - {{ role.group.acronym }} - ) + ({{ role.group.acronym }}) {{ role.email.address }} diff --git a/ietf/templates/stats/document_stats_author_affiliation.html b/ietf/templates/stats/document_stats_author_affiliation.html index 0d11c35b7..01913b207 100644 --- a/ietf/templates/stats/document_stats_author_affiliation.html +++ b/ietf/templates/stats/document_stats_author_affiliation.html @@ -82,8 +82,7 @@ or see the existing known aliases and - generally ignored endings - . + generally ignored endings.

    {% endif %} {% if alias_data %} diff --git a/ietf/templates/stats/document_stats_author_hindex.html b/ietf/templates/stats/document_stats_author_hindex.html index 5d6b15971..51b5f97ad 100644 --- a/ietf/templates/stats/document_stats_author_hindex.html +++ b/ietf/templates/stats/document_stats_author_hindex.html @@ -70,8 +70,8 @@ measure of the productivity and impact of the publications of an author - - . An + . + An author with an h-index of 5 has had 5 publications each cited at least 5 times - to increase the index to 6, the 5 publications plus 1 more would have to have been cited at least 6 times, each. Thus a diff --git a/ietf/templates/stats/known_countries_list.html b/ietf/templates/stats/known_countries_list.html index afaadc573..0a2f464fe 100644 --- a/ietf/templates/stats/known_countries_list.html +++ b/ietf/templates/stats/known_countries_list.html @@ -12,8 +12,7 @@

    In case you think a country or an alias is missing from the list, you can - file a ticket - . + file a ticket.

    {% if request.user.is_staff %}

    diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html index 22d1ac024..aa24a0fb9 100644 --- a/ietf/templates/submit/tool_instructions.html +++ b/ietf/templates/submit/tool_instructions.html @@ -137,7 +137,7 @@

    - Button to start the automated posting process with submitter authentication. Once clicked, an email message will be sent to the parties who can verify the sybmission. For a new draft (-00), that will be the authors listed in the document. For -01 and subsequent drafts, the confirmation message is sent to the authors of the previous version. One of the recipients of the confirmation message will need to open the email message via his or her email application, and click the link provided in the message body. + Button to start the automated posting process with submitter authentication. Once clicked, an email message will be sent to the parties who can verify the submission. For a new draft (-00), that will be the authors listed in the document. For -01 and subsequent drafts, the confirmation message is sent to the authors of the previous version. One of the recipients of the confirmation message will need to open the email message via his or her email application, and click the link provided in the message body.

    Once a link in the email body is clicked, the document gets pushed to the IETF Web and FTP sites, a notification is sent to the authors of the document, and an I-D Action announcement will be sent out within the next 15 minutes.