From 962253f99455b558822128b902c82488aab91542 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 28 Oct 2021 13:08:10 +0000 Subject: [PATCH] Remove the Note Well from the datatracker and point to the IETF web site. One less thing to keep in sync if the Note Well changes. Commit ready for merge. - Legacy-Id: 19484 --- ietf/submit/tests.py | 5 +- ietf/submit/urls.py | 3 +- ietf/submit/views.py | 5 +- ietf/templates/submit/note_well.html | 100 ------------------- ietf/templates/submit/submit_base.html | 5 +- ietf/templates/submit/tool_instructions.html | 6 +- ietf/templates/submit/upload_submission.html | 3 +- 7 files changed, 10 insertions(+), 117 deletions(-) delete mode 100644 ietf/templates/submit/note_well.html diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py index 7764b2726..2df731b14 100644 --- a/ietf/submit/tests.py +++ b/ietf/submit/tests.py @@ -1534,9 +1534,6 @@ class SubmitTests(TestCase): self.assertEqual(s.state_id, "cancel") def test_help_pages(self): - r = self.client.get(urlreverse("ietf.submit.views.note_well")) - self.assertEqual(r.status_code, 200) - r = self.client.get(urlreverse("ietf.submit.views.tool_instructions")) self.assertEqual(r.status_code, 200) @@ -2916,4 +2913,4 @@ class RefsTests(TestCase): self.assertEqual(refs['rfc8174'], 'norm') self.assertEqual(refs['rfc8126'], 'info') self.assertEqual(refs['rfc8175'], 'info') - + \ No newline at end of file diff --git a/ietf/submit/urls.py b/ietf/submit/urls.py index e26a62975..1d99f9407 100644 --- a/ietf/submit/urls.py +++ b/ietf/submit/urls.py @@ -10,7 +10,6 @@ urlpatterns = [ url(r'^status/(?P\d+)/confirm/(?P[a-f\d]+)/$', views.confirm_submission), url(r'^status/(?P\d+)/edit/$', views.edit_submission), url(r'^status/(?P\d+)/(?P[a-f\d]+)/edit/$', views.edit_submission), - url(r'^note-well/$', views.note_well), url(r'^tool-instructions/$', views.tool_instructions), url(r'^approvals/$', views.approvals), @@ -26,4 +25,4 @@ urlpatterns = [ url(r'^manualpost/email/(?P\d+)/(?P\d+)/(?P[a-f\d]*)/$', views.show_submission_email_message), url(r'^manualpost/replyemail/(?P\d+)/(?P\d+)/$', views.send_submission_email), url(r'^manualpost/sendemail/(?P\d+)/$', views.send_submission_email), -] +] \ No newline at end of file diff --git a/ietf/submit/views.py b/ietf/submit/views.py index 4a61a4eeb..66c7eadf3 100644 --- a/ietf/submit/views.py +++ b/ietf/submit/views.py @@ -199,9 +199,6 @@ def api_submit(request): else: return err(405, "Method not allowed") -def note_well(request): - return render(request, 'submit/note_well.html', {'selected': 'notewell'}) - def tool_instructions(request): return render(request, 'submit/tool_instructions.html', {'selected': 'instructions'}) @@ -926,4 +923,4 @@ def get_submission_or_404(submission_id, access_token=None): if access_token and not key_matched: raise Http404 - return submission + return submission \ No newline at end of file diff --git a/ietf/templates/submit/note_well.html b/ietf/templates/submit/note_well.html deleted file mode 100644 index 2f782b3c3..000000000 --- a/ietf/templates/submit/note_well.html +++ /dev/null @@ -1,100 +0,0 @@ -{% extends "submit/submit_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} -{% block title %}Note Well{% endblock %} - -{% block submit_content %} - {% origin %} -

Note Well

- -

- - This is a reminder of IETF policies in effect on various topics such as - patents or code of conduct. It is only meant to point you in the right - direction. Exceptions may apply. The IETF's patent policy and the definition - of an IETF "contribution" and "participation" are set forth in BCP 79; - please read it carefully. - -

-

- As a reminder: -

-
    -
  • - - By participating in the IETF, you agree to follow IETF processes and - policies. - -
    • -
  • - - If you are aware that any IETF contribution is covered by patents or - patent applications that are owned or controlled by you or your sponsor, - you must disclose that fact, or not participate in the discussion. - -
    • -
  • - - As a participant in or attendee to any IETF activity you acknowledge that - written, audio, video, and photographic records of meetings may be made - public. - -
    • -
  • - - Personal information that you provide to IETF will be handled in - accordance with the IETF Privacy Statement. - -
    • -
  • - - As a participant or attendee, you agree to work respectfully with other - participants; please contact the ombudsteam - (https://www.ietf.org/contact/ombudsteam/) - if you have questions or concerns about this. - -
    • - -
-

- - Definitive information is in the documents listed below and other IETF BCPs. - For advice, please talk to WG chairs or ADs: - -

- - -{% endblock %} diff --git a/ietf/templates/submit/submit_base.html b/ietf/templates/submit/submit_base.html index 5d77ab8dc..28225d1e8 100644 --- a/ietf/templates/submit/submit_base.html +++ b/ietf/templates/submit/submit_base.html @@ -20,9 +20,6 @@
  • Instructions
    • -
  • - Note Well -
  • Approvals
    • @@ -34,4 +31,4 @@ {% block submit_content %} {% endblock %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html index d275f830d..506fb2ad9 100644 --- a/ietf/templates/submit/tool_instructions.html +++ b/ietf/templates/submit/tool_instructions.html @@ -43,7 +43,9 @@

    By submitting your I-D, you are granting some rights to the IETF Trust. Before you submit your I-D, - review the information on the NOTE WELL tab and BCP 78, + review the information in the + Note Well and + BCP 78, "Rights Contributors Provide to the IETF Trust".

    @@ -168,4 +170,4 @@ The specification for this tool can be found in RFC 4228.

    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html index 768f42ade..ccd8d4ac8 100644 --- a/ietf/templates/submit/upload_submission.html +++ b/ietf/templates/submit/upload_submission.html @@ -24,7 +24,8 @@ {% if not form.shutdown or user|has_role:"Secretariat" %}

    By submitting your I-D, you are granting some rights to the IETF Trust. - Before you submit your I-D, review the information on the NOTE WELL tab and + Before you submit your I-D, review the information in the + Note Well and BCP 78, "Rights Contributors Provide to the IETF Trust".