These slides have already been {% if submission.status.slug == 'approved' %} approved {% else %} rejected {% endif %}
-
-
The slides from {{ submission.submitter }} have already been {% if submission.status.slug == 'approved' %} approved {% else %} rejected {% endif %}. No further action is needed.
-
-
You may wish to
- {% if submission.status.slug == 'approved' and submission.doc %}
- view the slides or
+
+ These slides have already been
+ {% if submission.status.slug == 'approved' %}
+ approved
+ {% else %}
+ rejected
{% endif %}
- return to this meeting session.
-
-{% endblock %}
+
+
+ The slides from {{ submission.submitter }} have already been
+ {% if submission.status.slug == 'approved' %}
+ approved.
+ {% else %}
+ rejected.
+ {% endif %}
+ No further action is needed.
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 9cb2f2428..125ccd591 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -72,7 +72,7 @@
{% endif %}
{% if not_meeting_sessions %}
- {{ area.name }} groups not meeting:
+ {{ area.name }} groups not meeting:
{% for session in not_meeting_sessions %}
{% ifchanged session.group.acronym %}
{{ session.group.acronym }}
diff --git a/ietf/templates/meeting/proceedings/edit_material.html b/ietf/templates/meeting/proceedings/edit_material.html
index e9d1597de..ab4b798c1 100644
--- a/ietf/templates/meeting/proceedings/edit_material.html
+++ b/ietf/templates/meeting/proceedings/edit_material.html
@@ -1,13 +1,13 @@
+{# bs5ok #}
{% extends "meeting/proceedings/edit_material_base.html" %}
{# Copyright The IETF Trust 2021, All Rights Reserved #}
{% load tz %}
-
{% block intro %}
{% if material.active %}
- This item will be listed on the proceedings as "{{ material }}". To change this, set the title below.
+ This item will be listed on the proceedings as "{{ material }}". To change this, set the title below.
{% else %}
- This item currently will not appear on the proceedings.
+ This item currently will not appear on the proceedings.
{% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/proceedings/remove_restore_material.html b/ietf/templates/meeting/proceedings/remove_restore_material.html
index a37d9e601..d61581ec2 100644
--- a/ietf/templates/meeting/proceedings/remove_restore_material.html
+++ b/ietf/templates/meeting/proceedings/remove_restore_material.html
@@ -1,25 +1,21 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2021, All Rights Reserved #}
{% load origin %}
-
{% load django_bootstrap5 %}
-
-{% block title %}{{ action|capfirst }} {{material.type.name}} for {{ material.meeting }} proceedings{% endblock %}
-
+{% block title %}{{ action|capfirst }} {{ material.type.name }} for {{ material.meeting }} proceedings{% endblock %}
{% block content %}
{% origin %}
{{ action|capfirst }} material
-
-
{{ action|capfirst }} {{material}} for the {{ material.meeting }} proceedings?
-
+
+ {{ action|capfirst }} {{ material }} for the {{ material.meeting }} proceedings?
+
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/propose_session_slides.html b/ietf/templates/meeting/propose_session_slides.html
index 0d7ac9308..3dddff495 100644
--- a/ietf/templates/meeting/propose_session_slides.html
+++ b/ietf/templates/meeting/propose_session_slides.html
@@ -1,26 +1,28 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin static django_bootstrap5 %}
-
{% block title %}Propose Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
-
{% block content %}
{% origin %}
-
-
Propose Slides for {{ session.meeting }} : {{ session.group.acronym }}{% if session.name %} : {{session.name}}{% endif %}
This form will allow you to propose a slide deck to the session chairs. After you upload your proposal, mail will be sent to the session chairs asking for their approval.
+ This form will allow you to propose a slide deck to the session chairs. After you upload your proposal, mail will be sent to the session chairs asking for their approval.
+
-
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/remove_sessionpresentation.html b/ietf/templates/meeting/remove_sessionpresentation.html
index adfefe07f..eaed69046 100644
--- a/ietf/templates/meeting/remove_sessionpresentation.html
+++ b/ietf/templates/meeting/remove_sessionpresentation.html
@@ -1,33 +1,44 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
{% load django_bootstrap5 %}
-
-{% block title %}Remove {{sp.document}} from session{% endblock %}
-
+{% block title %}Remove {{ sp.document }} from session{% endblock %}
{% block content %}
{% origin %}
-
Confirm removing document from session {{sp.session}}
-
+
Confirm removing document from session {{ sp.session }}
{% if sp.session.is_material_submission_cutoff %}
-
The deadline for submission corrections has passed. This may affect published proceedings.
+
+ The deadline for submission corrections has passed. This may affect published proceedings.
+
{% endif %}
-
-
Document
-
{{sp.document.name}}{% if sp.rev %}-{{sp.rev}}{% else %} (current version){% endif %}
{% if not user.is_authenticated %}
- Sign in
+ Sign in
{% endif %}
{% else %}
-
-
-
-
Change password
-
-
-
-
- This password form uses the
- zxcvbn
- password strength estimator to give an indication of password strength.
- The crack time estimage given above assume online attack without rate
- limiting, at a rate of 10 attempts per second.
-
-
-
Offline cracking
-
- The datatracker currently uses the {{ hasher.algorithm }}
- password hasher with
-
- {% if hasher.iterations %}
- {{ hasher.iterations }} iterations
- {% elif hasher.rounds %}
- {{ hasher.rounds }} rounds
- {% elif hasher.time_cost and hasher.memory_cost and hasher.parallelism %}
- time cost {{ hasher.time_cost }}, memory cost {{ hasher.memory_cost }}
- and parallelism {{ hasher.parallelism }}
- {% endif %}
- .
- Calculating offline attack time if password hashes should leak is left
- as an excercise for the reader.
-
-
-
- As a guideline, if we assume offline hashing using the current hasher
- at a speed of 104 attempts per second, this password would
- take to crack.
-
-
-
-
+
Change password
+
+
+ Online attack: This password form uses the
+ zxcvbn
+ password strength estimator to give an indication of password strength.
+ The crack time estimate given above assume online attack without rate
+ limiting, at a rate of 10 attempts per second.
+
+ Offline cracking:
+ The datatracker currently uses the {{ hasher.algorithm }}
+ password hasher with
+ {% if hasher.iterations %}
+ {{ hasher.iterations }} iterations
+ {% elif hasher.rounds %}
+ {{ hasher.rounds }} rounds
+ {% elif hasher.time_cost and hasher.memory_cost and hasher.parallelism %}
+ time cost {{ hasher.time_cost }}, memory cost {{ hasher.memory_cost }}
+ and parallelism {{ hasher.parallelism }}
+ {% endif %}
+ .
+ Calculating offline attack time if password hashes should leak is left
+ as an exercise for the reader.
+
+ As a guideline, if we assume offline hashing using the current hasher
+ at a speed of 104 attempts per second, this password would
+ take to crack.
+
-
- {% endif %}
-{% endblock %}
+
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/change_username.html b/ietf/templates/registration/change_username.html
index 1ba6ff82a..dca2d009d 100644
--- a/ietf/templates/registration/change_username.html
+++ b/ietf/templates/registration/change_username.html
@@ -1,42 +1,23 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
{% load django_bootstrap5 %}
{% load static %}
-
{% block title %}Change username{% endblock %}
-
-
{% block content %}
{% origin %}
-
-
-
-
-
Change username
-
-
- This form lets you change your username (login) from {{ user.username }} to
- one of your other active email addresses. If you want to change to a new
- email address, then please first
- edit your profile
- to add that email address to the active email addresses for your account.
-
-
-
-
-
-
+
Change username
+
+ This form lets you change your username (login) from {{ user.username }} to
+ one of your other active email addresses. If you want to change to a new
+ email address, then please first
+ edit your profile
+ to add that email address to the active email addresses for your account.
-
-{% endblock %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/confirm_account.html b/ietf/templates/registration/confirm_account.html
index be4b6ff2b..55f29a430 100644
--- a/ietf/templates/registration/confirm_account.html
+++ b/ietf/templates/registration/confirm_account.html
@@ -1,40 +1,35 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load static %}
-
-{% load django_bootstrap5 %}
-
+{% load django_bootstrap5 textfilters %}
{% block title %}Complete account creation{% endblock %}
-
{% block js %}
{{ block.super }}
{% endblock %}
-
{% block content %}
{% origin %}
-
{% if success %}
Account creation successful
-
-
Your account with login {{ email }} has been created, using the password you have selected.
Confirm that you want to add the email address {{ email }} to your account {{ username }}.
-
-
{% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/confirm_profile_update.html b/ietf/templates/registration/confirm_profile_update.html
index c65801020..487759d04 100644
--- a/ietf/templates/registration/confirm_profile_update.html
+++ b/ietf/templates/registration/confirm_profile_update.html
@@ -1,21 +1,19 @@
+{# bs5ok #}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-
{% extends "base.html" %}
-
-{% load origin %}
-
-{% block title %}Profile update successful{% endblock%}
-
-{% block content %}
- {% origin %}
-
-
Profile update successful
-
-
Your account has been updated to reflect the changes you submitted.
-
- {% for email in email_confirmations %}
-
A confirmation email has been sent to {{email}}. The email will be activated after you click on the link it contains.
- {% endfor %}
-
- Edit profile
-{% endblock %}
\ No newline at end of file
+{% load origin textfilters %}
+{% block title %}Profile update successful{% endblock %}
+ {% block content %}
+ {% origin %}
+
Profile update successful
+
+ Your account has been updated to reflect the changes you submitted.
+
+ {% for email in email_confirmations %}
+
+ A confirmation email has been sent to {{ email|linkify }}. The email will be activated after you click on the link it contains.
+
+ {% endfor %}
+ Edit profile
+ {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/create.html b/ietf/templates/registration/create.html
index 885f93546..44d0306f3 100644
--- a/ietf/templates/registration/create.html
+++ b/ietf/templates/registration/create.html
@@ -1,48 +1,41 @@
+{# bs5ok #}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-
{% extends "base.html" %}
-
{% load origin %}
-
-{% load django_bootstrap5 %}
-
+{% load django_bootstrap5 textfilters %}
{% block title %}Account creation{% endblock %}
-
{% block content %}
{% origin %}
-
{% if to_email %}
Account request received.
-
-
Your account creation request has been successfully received.
-
-
We have sent an email to {{ to_email }} with instructions on how to complete the process.
-
+
+ Your account creation request has been successfully received.
+
+ We have sent an email to {{ to_email|linkify }} with instructions on how to complete the process.
+
{% else %}
-
Account creation
-
-
- If you already have an account and want to use a new email address,
- please go to your account profile page and
+
+
+
+ If you already have an account and want to use a new email address, please go to your account profile page and
+
+ Add a new email address
+
+
+
+
+ If you already have an account but forgot your password, please simply
+
+ Reset your password
+
+
+
+
+ Otherwise, please enter your email address in order to create your datatracker account.
Personal information in the datatracker which is derived from your contributions
to the IETF standards development process is covered by the EU General Data Protection
Regulation's
- Article 6(1) (f)
+
+ Article 6(1) (f)
+
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.
+ for the internet. See also the page on
+
+ handling
+ of personal information
+ .
-
Personal information which is not derived from your contributions is covered by the EU
- GDPR Article 6(1) (a)
+
+ GDPR Article 6(1) (a)
+
regarding consent. All such information is visible on this page and shown with the
symbol next to it, or listed on your
- notification subscription page. Most of this
+ notification subscription page.
+ Most of this
information can be edited or removed on these pages. There are some exceptions, such
- as photos, which currently require an email to the Secretariat
+ as photos, which currently require an email to
+ the Secretariat
if you wish to update or remove the information.
-
All the information the datatracker has that is coupled to this account and visible
on this page or otherwise related to your work on ietf documents, is also available
- to you as a JSON blob when
+ to you as a
+ JSON blob
+ when
you are logged in. It contains both the Legitimate Interest information and the information
that requires Consent.
{% endblock %}
-
{% block js %}
{% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/login.html b/ietf/templates/registration/login.html
index 62cd7ec8d..635c3e46f 100644
--- a/ietf/templates/registration/login.html
+++ b/ietf/templates/registration/login.html
@@ -1,26 +1,17 @@
+{# bs5ok #}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-
{% extends "base.html" %}
-
{% load origin %}
-
{% load django_bootstrap5 %}
-
{% block title %}Sign in{% endblock %}
-
{% block content %}
{% origin %}
Sign in
-
-
{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/manual.html b/ietf/templates/registration/manual.html
index bd16af047..8ee134cea 100644
--- a/ietf/templates/registration/manual.html
+++ b/ietf/templates/registration/manual.html
@@ -1,19 +1,17 @@
+{# bs5ok #}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-
{% extends "base.html" %}
-
{% load origin %}
-
{% block title %}Complete account creation{% endblock %}
-
{% block content %}
{% origin %}
-
Additional Assistance Required
-
-
+
Our apologies, it looks like there was an issue creating your Datatracker account.
- Please send an email to the IETF secretariat and we'll get you set up promptly.
+ Please send an email to the
+ IETF secretariat
+ and we'll get you set up promptly.
-
+ Email IETF secretariat
{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/missing_person.html b/ietf/templates/registration/missing_person.html
index 09fe6e085..bb89fdd08 100644
--- a/ietf/templates/registration/missing_person.html
+++ b/ietf/templates/registration/missing_person.html
@@ -1,14 +1,16 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
{% block content %}
{% origin %}
-
Your password reset request has been successfully received .
-
We have sent you an email with instructions on how to set a new password.
-
+
+ Your password reset request has been successfully received.
+ We have sent you an email with instructions on how to set a new password.
+
{% else %}
Password reset
-
-
Please enter the account for which you would like to reset the password.
-
+
+ Please enter the account for which you would like to reset the password.
+
-
{% endblock %}
-
{% block js %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/add_submit_email.html b/ietf/templates/submit/add_submit_email.html
index 68cdba837..e1eba6f39 100644
--- a/ietf/templates/submit/add_submit_email.html
+++ b/ietf/templates/submit/add_submit_email.html
@@ -1,39 +1,33 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
{% load django_bootstrap5 %}
-
-{% block title %}{% if submission == None %}Add new submission request email{% else %}Add submission request email to {{ submission.name }}{% endif %}{% endblock %}
-
+{% block title %}
+ {% if submission == None %}
+ Add new submission request email
+ {% else %}
+ Add submission request email to {{ submission.name }}
+ {% endif %}
+{% endblock %}
{% block content %}
{% origin %}
Add email
-
- {% if submission == None %}
-
+
+ {% if submission == None %}
A new submission request will be created for the given name and revision. The
- name must take the form "draft-xxx-nn" where xxx is lowercase letters, digits or dashes
- and nn is the revision number - 00 for the initial revision. For example
- draft-my-spec-00
-
- {% else %}
-
- The email will be added to the submission history for {{ submission.name }}
-
- {% endif %}
-
-
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/api_submit_info.html b/ietf/templates/submit/api_submit_info.html
index 515569731..0a15fd8cc 100644
--- a/ietf/templates/submit/api_submit_info.html
+++ b/ietf/templates/submit/api_submit_info.html
@@ -1,21 +1,19 @@
+{# bs5ok #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
{% block title %}Draft submission API instructions{% endblock %}
-
{% block content %}
{% origin %}
-
Draft submission API instructions
-
+
Draft submission API instructions
A simplified draft submission interface, intended for automation,
is available at {% url 'ietf.submit.views.api_submit' %}.
- The interface accepts only xml uploads which can be processed on the server, and
+ The interface accepts only XML uploads that can be processed on the server, and
requires the user to have a datatracker account. A successful submit still requires
- the same email confirmation roundtrip as submissions done through the regular
+ the same email confirmation round-trip as submissions done through the regular
submission tool.
@@ -23,16 +21,21 @@
Some limitations:
-
Only xml-only uploads are supported, not text or combined.
+
Only XML-only uploads are supported, not text or combined.
Document replacement information cannot be supplied.
-
The server expects multipart/form-data, supported by curl but not by wget
+
+ The server expects multipart/form-data, supported by curl but not by wget.
+
- It takes 2 parameters:
+ It takes two parameters:
-
user which is the user login
-
xml, which is the submitted file
+
+ user which is the user login
+
+
+ xml, which is the submitted file
It returns an appropriate http result code, and a brief explanatory text message.
@@ -40,11 +43,8 @@
Here is an example:
-
- $ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" https://datatracker.ietf.org/api/submit
- Upload of draft-user-example OK, confirmation requests sent to:
- User Name <user.name@example.com>
-
-
-
-{% endblock %}
+
+$ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" https://datatracker.ietf.org/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/approvals.html b/ietf/templates/submit/approvals.html
index 83a3993e7..7a0b4bed4 100644
--- a/ietf/templates/submit/approvals.html
+++ b/ietf/templates/submit/approvals.html
@@ -1,22 +1,20 @@
+{# bs5ok #}
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static %}
-
+{% load origin static person_filters ietf_filters %}
{% block pagehead %}
{% endblock %}
-
{% block title %}Draft submission approvals{% endblock %}
-
{% load ietf_filters %}
-
{% block submit_content %}
{% origin %}
{% if user.is_authenticated %}
-
This is where chairs and the secretariat can approve and pre-approve document
- submissions which require approval, such as WG -00 drafts.
+ submissions which require approval, such as WG -00 drafts.
- You need to sign in in order to handle approvals.
+ You need to
+
+ sign in
+
+ in order to handle approvals.
{% endif %}
{% endblock %}
-
{% block js %}
{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/cancel_preapproval.html b/ietf/templates/submit/cancel_preapproval.html
index b99ebf9a9..b0589d91c 100644
--- a/ietf/templates/submit/cancel_preapproval.html
+++ b/ietf/templates/submit/cancel_preapproval.html
@@ -1,30 +1,21 @@
+{# bs5ok #}
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-
+{% load origin person_filters %}
{% load django_bootstrap5 %}
-
{% block title %}Cancel pre-approval{% endblock %}
-
{% block submit_content %}
{% origin %}
Cancel pre-approval
-
-
- Pre-approval of {{ preapproval.name }} by {{ preapproval.by }}
+
+ Pre-approval of {{ preapproval.name }} by {% person_link preapproval.by %}
on {{ preapproval.time }}.
-
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/confirm_submission.html b/ietf/templates/submit/confirm_submission.html
index 759c712ae..9ae07419f 100644
--- a/ietf/templates/submit/confirm_submission.html
+++ b/ietf/templates/submit/confirm_submission.html
@@ -1,57 +1,71 @@
+{# bs5ok #}
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
-
{% block title %}Confirm submission of {{ submission.name }}{% endblock %}
-
{% block submit_content %}
{% origin %}
Confirm submission of {{ submission.name }}
-
{% if submission.state_id != "auth" and submission.state_id != "aut-appr" %}
{% if submission.state_id == "posted" %}
-
The submission has already been posted. See the draft here.
+
+ The submission has already been posted. See the
+ draft here.
+
{% else %}
-
The submission is not in a state where it can be confirmed.
-
-
Go to the status page
- to see what has happened to it.
+
+
+ The submission is not in a state where it can be confirmed.
+
+
+ Go to the
+ status page
+ to see what has happened to it.
+
+
{% endif %}
{% else %}
-
{% if not key_matched %}
-
Incorrect authorization key.
-
-
Double-check the link you followed. If everything fails, you can go to
- the status page,
- cancel the submission and try again.
+
+
+ Incorrect authorization key.
+
+
+ Double-check the link you followed. If everything fails, you can go to
+ the
+ status page,
+ cancel the submission and try again.
+
+
{% else %}
-
Authorization key accepted.
-
-
Go to the status page
- for submission details and links to the files which will be posted.
-
-
Please press the button below to finish posting of
- {{ submission.name }}-{{ submission.rev }}.
-
-
+
+
+ Authorization key accepted.
+
+
+ Go to the
+ status page
+ for submission details and links to the files which will be posted.
+
+
+ Please press the button below to finish posting of
+ {{ submission.name }}-{{ submission.rev }}.
+
{% endif %}
-
{% if user|has_role:"Secretariat" %}
- New submission from email
+
+ New submission from email
+
{% endif %}
-
{% endblock %}
-
{% block js %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/submit/problem-reports-footer.html b/ietf/templates/submit/problem-reports-footer.html
index 30594c222..93e581fd5 100644
--- a/ietf/templates/submit/problem-reports-footer.html
+++ b/ietf/templates/submit/problem-reports-footer.html
@@ -1,14 +1,13 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
-
-
+{# bs5ok #}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% origin %}
+
Please send reports about submission tool bugs to the Tools Team using one
of the Bug Report links at the bottom of the page.
-
-
-
-
+
If you run into problems submitting an Internet-Draft and need to request manual posting of an Internet-Draft, please send the
- draft and the reason for manual posting to {{settings.SECRETARIAT_SUPPORT_EMAIL}}.
+ draft and the reason for manual posting to
+ {{ settings.SECRETARIAT_SUPPORT_EMAIL }}.
Be advised that manual processing always takes additional time.
-
-
+
\ No newline at end of file
diff --git a/ietf/templates/submit/replaces_form.html b/ietf/templates/submit/replaces_form.html
index 60b8cb32b..08128ce6d 100644
--- a/ietf/templates/submit/replaces_form.html
+++ b/ietf/templates/submit/replaces_form.html
@@ -1,13 +1,4 @@
-{% for field in replaces_form %}
-
+ {% if user|has_role:"Secretariat" %}
+
+ Reply
+
+ {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/submission_files.html b/ietf/templates/submit/submission_files.html
index d92c94b5a..306426922 100644
--- a/ietf/templates/submit/submission_files.html
+++ b/ietf/templates/submit/submission_files.html
@@ -1,9 +1,12 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
+{# bs5ok #}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% origin %}
{% for file in files %}
{% if file.exists %}
-
-
+
+
{{ file.ext }}
{% endif %}
-{% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index d72fe7a64..a0be97a2f 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -1,141 +1,167 @@
+{# bs5ok #}
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load static %}
+{% load static ietf_filters textfilters person_filters %}
{% load ietf_filters submit_tags misc_filters %}
-
{% block title %}Submission status of {{ submission.name }}-{{ submission.rev }}{% endblock %}
-
{% block pagehead %}
{{ block.super }}
{{ all_forms|merge_media:'css' }}
+
{% endblock %}
-
{% block submit_content %}
{% origin %}
{% if submission.state_id != "uploaded" %}
-
Submission status: {{ submission.state.name }}
+
Submission status: {{ submission.state.name }}
{% endif %}
-
{% if message %}
-
{{ message.1 }}
+
+ {{ message.1 }}
+
{% endif %}
-
{% if submission.state_id == "aut-appr" and submission.submitter_parsed.email not in confirmation_list|join:", " %}
-
+
Please note that since the database does not have your email address in the list of authors of previous
revisions of the document, you are not receiving a confirmation email yourself; one of the
addressees above will have to send a confirmation in order to complete the submission. This is done
to avoid document hijacking. If none of the known previous authors will be able to confirm the
- submission, please contact the Secretariat for action.
+ submission, please contact
+ the Secretariat
+ for action.
{% endif %}
-
{% if submitter_form.errors or replaces_form.errors or extresources_form.errors %}
-
Please fix errors in the form below.
+
+ Please fix errors in the form below.
+
{% endif %}
-
-
Submission checks
-
+
Submission checks
+
{% if passes_checks %}
Your draft has been verified to pass the submission checks.
{% else %}
Your draft has NOT been verified to pass the submission checks.
{% endif %}
-
- {% if submission.authors|length > 5 %}
- This document has more than five authors listed, which is considered excessive
- under normal circumstances. 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
- RFC 7322, section 4.1.1 for details.
+ {% if submission.authors|length > 5 %}
+
+
+ This document has more than five authors listed, which is considered excessive
+ under normal circumstances. 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
+ RFC 7322, section 4.1.1
+ for details.
+
{% endif %}
-
{% for check in submission.latest_checks %}
{% if check.errors %}
-
- The {{check.checker}} returned {{ check.errors }} error{{ check.errors|pluralize }}
+
+ The {{ check.checker }} returned {{ check.errors }} error{{ check.errors|pluralize }}
and {{ check.warnings }} warning{{ check.warnings|pluralize }}; click the button
below to see details. Please fix those, and resubmit.
{% elif check.warnings %}
-
- The {{check.checker}} returned {{ check.warnings }} warning{{ check.warnings|pluralize }}.
+
+ The {{ check.checker }} returned {{ check.warnings }} warning{{ check.warnings|pluralize }}.
{% endif %}
{% endfor %}
-
{% for check in submission.latest_checks %}
{% if check.passed != None %}
-
-
-
-
+
+
+
-
-
{{ check.checker|title }} for {{ submission.name }}-{{ submission.rev }}
-
{% if submission.state_id == "waiting-for-draft" %}
-
+
This submission is awaiting the first draft upload.
{% else %}
-
Meta-data from the submission
-
+
Meta-data from the submission
{% if errors %}
-
-
Meta-Data errors found!
-
Please make sure that your Internet-Draft includes all of the required meta-data in the proper format.
-
-
If your Internet-Draft does include all of the required meta-data in the proper format, and if
- the error(s) identified below are due to the failure of the tool to extract the meta-data correctly,
- then please use the "Adjust meta-data" button below, which will take you to the "Adjust screen" where
- you can correct the improperly extracted meta-data. You will then be able to submit your Internet-Draft
- to the Secretariat for manual posting.
-
-
If your Internet-Draft does not include all of the required meta-data in the proper format, then
- please cancel this submission, update your Internet-Draft, and resubmit it.
-
-
Note: The secretariat will not add any
+
+
+ Meta-Data errors found!
+
+
+ Please make sure that your Internet-Draft includes all of the required meta-data in the proper format.
+
+
+
+ If your Internet-Draft does include all of the required meta-data in the proper format, and if
+ the error(s) identified below are due to the failure of the tool to extract the meta-data correctly,
+ then please use the "Adjust meta-data" button below, which will take you to the "Adjust screen" where
+ you can correct the improperly extracted meta-data. You will then be able to submit your Internet-Draft
+ to the Secretariat for manual posting.
+
+
+ If your Internet-Draft does not include all of the required meta-data in the proper format, then
+ please cancel this submission, update your Internet-Draft, and resubmit it.
+
+
+
+ Note: The secretariat will not add any
meta-data to your Internet-Draft or edit the meta-data. An
Internet-Draft that does not include all of the required meta-data in
- the proper format will be returned to the submitter.
+ the proper format will be returned to the submitter.
+
- {% for l in submission.formal_languages.all %}{{ l.name }}{% if not forloop.last %}, {% endif %}{% empty %}None recognized{% endfor %}
- {% if errors.formal_languages %}
You are not allowed to modify or cancel this submission. You can
+
+
+ You are not allowed to modify or cancel this submission. You can
only modify or cancel this submission from the same URL you were
- redirected to after the submission.
-
-
If you are the submitter check your browser history to find this
- URL. You can share it with any person you need.
-
-
If you are one of the authors you can request the URL from which
+ redirected to after the submission.
+
+
+ If you are the submitter check your browser history to find this
+ URL. You can share it with any person you need.
+
+
+ If you are one of the authors you can request the URL from which
you can modify or cancel this submission by clicking the next
button. An email will then be sent to the authors and submitter
- (if submitter email was entered): {{ confirmation_list|join:", " }}.
{% if e.desc|startswith:"Received message" or e.desc|startswith:"Sent message" %}
{% with m=e.submissionemailevent.message %}
{% if user.is_authenticated %}
-
- {% block submit_content %}
- {% endblock %}
-
-{% endblock %}
\ No newline at end of file
+ {% block submit_content %}{% endblock %}
+{% endblock %}
diff --git a/ietf/templates/submit/submitter_form.html b/ietf/templates/submit/submitter_form.html
index 1fc340309..58d26080c 100644
--- a/ietf/templates/submit/submitter_form.html
+++ b/ietf/templates/submit/submitter_form.html
@@ -1,27 +1,26 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
+{# bs5ok #}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% origin %}
{% load django_bootstrap5 %}
-
-
Submitter
+
Submitter
If you are one of the authors, please click the button below
with your name on it to automatically fill in the
submitter information. Otherwise,
please manually enter your name and email address.
-
{% load ietf_filters %}
-
-
-
{% for author in submission.authors %}
-
+
{% endfor %}
-
-
-
{% bootstrap_form_errors submitter_form %}
{% bootstrap_field submitter_form.name %}
{% bootstrap_field submitter_form.email %}
{% if user|has_role:"Secretariat" %}
{% bootstrap_field submitter_form.approvals_received %}
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html
index d9a5de576..22d1ac024 100644
--- a/ietf/templates/submit/tool_instructions.html
+++ b/ietf/templates/submit/tool_instructions.html
@@ -1,169 +1,220 @@
+{# bs5ok #}
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-
{% block title %}I-D Submission tool instructions{% endblock %}
-
{% block submit_content %}
{% origin %}
-
This page will explain the purpose and content of each screen in the I-D Submission Tool, and the actions that result by clicking the form buttons on each screen.
-
Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF), its areas, and its working groups. Note that other
groups may also distribute working documents as Internet-Drafts.
-
Internet-Drafts are draft documents, and are valid for a maximum of
six months. They may be updated, replaced, or obsoleted by other
documents at any time.
+ The specification for this tool can be found in
+ RFC 4228.
+
+
Upload screen
The Upload screen is the first screen that a user will see when he or she starts the I-D submission process. A user can submit three different formats of an I-D, XML, plain-text, and PDF, at the same time. Failure to submit at least one of a plain-text or xml version will cause an error, and an error screen will be displayed. A single v3 .xml source is preferred. A single v2 .xml source will be accepted. If neither of those are available, a plain-text document may be provided.
-
By submitting your I-D, you are granting some rights to the IETF Trust. Before you submit your I-D,
review the information in the
- Note Well and
+ Note Well
+ and
BCP 78,
"Rights Contributors Provide to the IETF Trust".
-
Before you submit your I-D, it is recommended that you check it for nits
- using the idnits tool.
-
-
-
- Form buttons and resulting actions:
+ using the
+ idnits tool.
-
-
.txt format
-
Button to select a plain-text file of an I-D from a user's local file system.
-
-
-
.xml format
-
Button to select an XML file of an I-D from a user's local file system.
-
-
-
.pdf format
-
Button to select a PDF file of an I-D from a user's local file system.
-
-
-
Upload
-
Button to upload the document(s). The tool will begin parsing the plain-text document (or creating it from the xml if only xml is provided) and validate the document. The parsed meta-data will be displayed for user confirmation along with the validation results.
-
+
+
+
Form buttons and resulting actions:
+
+
+
+
+
.txt format
+
Button to select a plain-text file of an I-D from a user's local file system.
+
+
+
.xml format
+
Button to select an XML file of an I-D from a user's local file system.
+
+
+
.pdf format
+
Button to select a PDF file of an I-D from a user's local file system.
+
+
+
Upload
+
+ Button to upload the document(s). The tool will begin parsing the plain-text document (or creating it from the xml if only xml is provided) and validate the document. The parsed meta-data will be displayed for user confirmation along with the validation results.
+
+
+
-
-
Validation screen
+
Validation screen
- After a user uploads the document(s), the tool will parse the plain-text version, validate the I-D, and display the validation results with option(s) for next steps. The validation includes: checking for all IPR-related notices and I-D boilerplate described in Guidelines to Authors of Internet-Drafts; the required sections described in the I-D Check List; the version number; and the creation date.
+ After a user uploads the document(s), the tool will parse the plain-text version, validate the I-D, and display the validation results with option(s) for next steps. The validation includes: checking for all IPR-related notices and I-D boilerplate described in
+ Guidelines to Authors of Internet-Drafts;
+ the required sections described in
+ the I-D Check List;
+ the version number; and the creation date.
-
If the submission does not have any validation errors, then the user will be allowed to proceed with the automated posting process. This process will begin with submitter authentication, which will be done by e-mail.
-
A user must carefully examine the meta-data that are displayed on this screen, and make sure that these data were extracted correctly. If the data were not extracted correctly, then the user can correct the errors via the Adjust page. In such a case, the user will pass the draft to the Secretariat for manual posting.
-
-
Form buttons and resulting actions:
-
-
-
Adjust meta-data
-
Button to proceed to a screen with editable form fields for correcting the meta-data. A user can use this button to request manual posting by the Secretariat.
-
-
-
Cancel
-
Button to cancel the current submission. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
-
+
+
+
Form buttons and resulting actions:
+
+
+
+
+
Adjust meta-data
+
+ Button to proceed to a screen with editable form fields for correcting the meta-data. A user can use this button to request manual posting by the Secretariat.
+
+
+
+
Cancel
+
+ Button to cancel the current submission. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+
+
+
+
+
+
+ When no meta-data error is detected:
+
+
+
+
+
+
+ Button(s) with author's name(s)
+
+
+ Button(s) to automatically fill out the given name, family name, and email address of the authors. If the submitter is one of the authors, then the submitter's information will be automatically inserted in the appropriate fields. If the submitter is not one of the authors, then the submitter will need to manually fill out these fields.
+
+
+
+
+ Post now
+
+
+
+ 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.
+
+
+ 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.
+
+
+ If the document requires an additional approval from a chair of a working group, i.e., for submission of a 00 version of a working group document, then a message will be sent to the chairs of the working group for the approval. Once approved, the document will be immediately announced and available via the IETF Web and FTP sites.
+
+
+
+
-
-
-
When no meta-data error is detected:
-
-
-
-
Button(s) with author's name(s)
-
Button(s) to automatically fill out the given name, family name, and email address of the authors. If the submitter is one of the authors, then the submitter's information will be automatically inserted in the appropriate fields. If the submitter is not one of the authors, then the submitter will need to manually fill out these fields.
-
-
-
Post now
-
-
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.
-
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.
-
If the document requires an additional approval from a chair of a working group, i.e., for submission of a 00 version of a working group document, then a message will be sent to the chairs of the working group for the approval. Once approved, the document will be immediately announced and available via the IETF Web and FTP sites.
-
-
-
-
-
-
Adjust screen
+
+ Adjust screen
+
This is the screen where a user can adjust any meta-data that could have been incorrectly parsed from the submitted document. The document with adjusted meta-data will be submitted to the Secretariat for manual posting.
-
-
Form buttons and resulting actions:
-
-
-
Button(s) with author's name(s)
-
Button(s) to automatically fill out the given name, family name, and email address of the authors. If the submitter is one of the authors, then the submitter's information will be automatically inserted in the appropriate fields. If the submitter is not one of the authors, then the submitter will need to manually fill out these fields.
-
-
-
Submit for manual posting
-
Button to send a manual posting request to the Secretariat including any corrected meta-data and comments for the Secretariat. Once clicked, a notification message will be sent to the Secretariat, and a receipt page will be displayed.
+
+
+
+ Form buttons and resulting actions:
+
+
+
+
+
+
+ Button(s) with author's name(s)
+
+
+ Button(s) to automatically fill out the given name, family name, and email address of the authors. If the submitter is one of the authors, then the submitter's information will be automatically inserted in the appropriate fields. If the submitter is not one of the authors, then the submitter will need to manually fill out these fields.
+
-
Cancel
-
Button to cancel the current submission. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current suissio
- n will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+
+ Submit for manual posting
+
+
+ Button to send a manual posting request to the Secretariat including any corrected meta-data and comments for the Secretariat. Once clicked, a notification message will be sent to the Secretariat, and a receipt page will be displayed.
+
-
-
-
Status screen
-
- The Status screen is the screen where a user can view the current status of a document that has just been submitted by the user, or a document that was submitted previously via the tool. If a link 'Status' is clicked from the tool's first page, then a form field will be provided for a user to look up a document by name.
-
-
-
Form buttons and resulting actions:
-
-
-
Cancel
-
Button to cancel the current submission. This button will be displayed only when the document is in the process of being submitted. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+
+ Cancel
+
+
+ Button to cancel the current submission. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current suissio
+ n will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+
-
-
-
Problem report
-
- {% include "submit/problem-reports-footer.html" %}
-
-
- The specification for this tool can be found in RFC 4228.
-
-
-{% endblock %}
+
+
+
+ Status screen
+
+
+ The Status screen is the screen where a user can view the current status of a document that has just been submitted by the user, or a document that was submitted previously via the tool. If a link 'Status' is clicked from the tool's first page, then a form field will be provided for a user to look up a document by name.
+
+
+
+
+
+ Form buttons and resulting actions:
+
+
+
+
+
+
+ Cancel
+
+
+ Button to cancel the current submission. This button will be displayed only when the document is in the process of being submitted. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+
+
+
+
+ {% include "submit/problem-reports-footer.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html
index 141247a0d..f3bcc68e8 100644
--- a/ietf/templates/submit/upload_submission.html
+++ b/ietf/templates/submit/upload_submission.html
@@ -1,94 +1,81 @@
+{# bs5ok #}
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
{% load django_bootstrap5 %}
-
{% block title %}Upload{% endblock %}
-
{% block submit_content %}
{% origin %}
-
{% if form.shutdown and user|has_role:"Secretariat" %}
-
+
Warning: Currently in I-D submission blackout period.
{% endif %}
-
- {% if form.cutoff_warning %}
-
- {{ form.cutoff_warning|safe }}
-
- {% endif %}
-
+ {% if form.cutoff_warning %}
{{ form.cutoff_warning|safe }}
{% endif %}
{% 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 in the
- Note Well and
+ Note Well
+ and
BCP 78,
"Rights Contributors Provide to the IETF Trust".
-
-
-
+
Before you submit your I-D, it is recommended that you check it for nits
- using the idnits tool, and
- fix them.
-
-
-