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
This commit is contained in:
Lars Eggert
parent
e8a1e6c45a
commit
962253f994
|
|
@ -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')
|
||||
|
||||
|
||||
|
|
@ -10,7 +10,6 @@ urlpatterns = [
|
|||
url(r'^status/(?P<submission_id>\d+)/confirm/(?P<auth_token>[a-f\d]+)/$', views.confirm_submission),
|
||||
url(r'^status/(?P<submission_id>\d+)/edit/$', views.edit_submission),
|
||||
url(r'^status/(?P<submission_id>\d+)/(?P<access_token>[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<submission_id>\d+)/(?P<message_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.show_submission_email_message),
|
||||
url(r'^manualpost/replyemail/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', views.send_submission_email),
|
||||
url(r'^manualpost/sendemail/(?P<submission_id>\d+)/$', views.send_submission_email),
|
||||
]
|
||||
]
|
||||
|
|
@ -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
|
||||
|
|
@ -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 %}
|
||||
<h2>Note Well</h2>
|
||||
|
||||
<p>
|
||||
|
||||
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.
|
||||
|
||||
</p>
|
||||
<p>
|
||||
As a reminder:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
By participating in the IETF, you agree to follow IETF processes and
|
||||
policies.
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
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.
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
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.
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
Personal information that you provide to IETF will be handled in
|
||||
accordance with the IETF Privacy Statement.
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
As a participant or attendee, you agree to work respectfully with other
|
||||
participants; please contact the ombudsteam
|
||||
(<a href="https://www.ietf.org/contact/ombudsteam/">https://www.ietf.org/contact/ombudsteam/</a>)
|
||||
if you have questions or concerns about this.
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
<p>
|
||||
|
||||
Definitive information is in the documents listed below and other IETF BCPs.
|
||||
For advice, please talk to WG chairs or ADs:
|
||||
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="https://datatracker.ietf.org/doc/html/bcp9">BCP 9</a>
|
||||
(Internet Standards Process)
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://datatracker.ietf.org/doc/html/bcp25"> BCP 25 </a>
|
||||
(Working Group processes)
|
||||
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://datatracker.ietf.org/doc/html/bcp25"> BCP 25 </a>
|
||||
(Anti-Harassment Procedures)
|
||||
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://datatracker.ietf.org/doc/html/bcp54"> BCP 54 </a>
|
||||
(Code of Conduct)
|
||||
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://datatracker.ietf.org/doc/html/bcp78"> BCP 78 </a>
|
||||
(Copyright)
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://datatracker.ietf.org/doc/html/bcp79"> BCP 79 </a>
|
||||
(Patents, Participation)
|
||||
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://www.ietf.org/privacy-policy/"> https://www.ietf.org/privacy-policy/ </a>
|
||||
(Privacy Policy)
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -20,9 +20,6 @@
|
|||
<li {% if selected == "instructions" %}class="active"{% endif %}>
|
||||
<a href="{% url "ietf.submit.views.tool_instructions" %}">Instructions</a>
|
||||
</li>
|
||||
<li {% if selected == "notewell" %}class="active"{% endif %}>
|
||||
<a href="{% url "ietf.submit.views.note_well" %}">Note Well</a>
|
||||
</li>
|
||||
<li {% if selected == "approvals" %}class="active"{% endif %}>
|
||||
<a href="{% url "ietf.submit.views.approvals" %}">Approvals</a>
|
||||
</li>
|
||||
|
|
@ -34,4 +31,4 @@
|
|||
{% block submit_content %}
|
||||
{% endblock %}
|
||||
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
@ -43,7 +43,9 @@
|
|||
|
||||
<p>
|
||||
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 <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
|
||||
review the information in the
|
||||
<a href="https://www.ietf.org/about/note-well/">Note Well</a> and
|
||||
<a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
|
||||
"Rights Contributors Provide to the IETF Trust".
|
||||
</p>
|
||||
|
||||
|
|
@ -168,4 +170,4 @@
|
|||
The specification for this tool can be found in <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc4228' %}">RFC 4228</a>.
|
||||
</p>
|
||||
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
@ -24,7 +24,8 @@
|
|||
{% if not form.shutdown or user|has_role:"Secretariat" %}
|
||||
<p class="alert alert-warning">
|
||||
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
|
||||
<a href="https://www.ietf.org/about/note-well/">Note Well</a> and
|
||||
<a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
|
||||
"Rights Contributors Provide to the IETF Trust".
|
||||
</p>
|
||||
|
|
|
|||
Loading…
Reference in a new issue