diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py index f5a5dc28c..8189d8f24 100644 --- a/ietf/doc/admin.py +++ b/ietf/doc/admin.py @@ -140,3 +140,9 @@ class BallotPositionDocEventAdmin(DocEventAdmin): admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin) +class RelatedDocumentAdmin(admin.ModelAdmin): + list_display = ['source', 'target', 'relationship', ] + list_filter = ['relationship', ] + search_fields = ['source__name', 'target__name', 'target__document__name', ] + raw_id_fields = ['source', 'target', ] +admin.site.register(RelatedDocument, RelatedDocumentAdmin) diff --git a/ietf/idrfc/mirror_rfc_editor_queue.py b/ietf/idrfc/mirror_rfc_editor_queue.py index a3912e58f..0faf941cb 100644 --- a/ietf/idrfc/mirror_rfc_editor_queue.py +++ b/ietf/idrfc/mirror_rfc_editor_queue.py @@ -213,6 +213,7 @@ def get_rfc_state_mapping(): return { 'AUTH': State.objects.get_or_create(type=t, slug='auth', name='AUTH', desc="Awaiting author action")[0], 'AUTH48': State.objects.get_or_create(type=t, slug='auth48', name="AUTH48", desc="Awaiting final author approval")[0], + 'AUTH48-DONE': State.objects.get_or_create(type=t, slug='auth48done', name="AUTH48-DONE", desc="Final approvals are complete")[0], 'EDIT': State.objects.get_or_create(type=t, slug='edit', name='EDIT', desc="Approved by the stream manager (e.g., IESG, IAB, IRSG, ISE), awaiting processing and publishing")[0], 'IANA': State.objects.get_or_create(type=t, slug='iana-crd', name='IANA', desc="RFC-Editor/IANA Registration Coordination")[0], 'IESG': State.objects.get_or_create(type=t, slug='iesg', name='IESG', desc="Holding for IESG action")[0], diff --git a/ietf/idtracker/templatetags/ietf_filters.py b/ietf/idtracker/templatetags/ietf_filters.py index e42994981..9dead8c4a 100644 --- a/ietf/idtracker/templatetags/ietf_filters.py +++ b/ietf/idtracker/templatetags/ietf_filters.py @@ -466,6 +466,13 @@ def user_roles_json(user): roles[g.name] = True return mark_safe(simplejson.dumps(roles)) +@register.filter +def textify(text): + text = re.sub("", "*", text) + text = re.sub("", "/", text) + # There are probably additional conversions we should apply here + return text + def _test(): import doctest doctest.testmod() diff --git a/ietf/templates/community/public/notification_email.txt b/ietf/templates/community/public/notification_email.txt index 0e0c3214b..6db28028d 100644 --- a/ietf/templates/community/public/notification_email.txt +++ b/ietf/templates/community/public/notification_email.txt @@ -1,15 +1,16 @@ -{% autoescape off %} +{% autoescape off %}{% load ietf_filters %} Hello, -This is a notification from {{ clist.long_name }}. +This is a notification from the {{ clist.long_name }}. -Document: {{ notification.doc }} +Document: {{ notification.doc }}, +https://datatracker.ietf.org/doc/{{ notification.doc }} Change: -{{ notification.desc }} +{{ notification.desc|textify|striptags }} Best regards, - The datatracker login manager service + The datatracker draft tracking service (for the IETF Secretariat) {% endautoescape %} diff --git a/ietf/templates/meeting/agenda.csv b/ietf/templates/meeting/agenda.csv index 4bd84e3ac..3e5770e7d 100644 --- a/ietf/templates/meeting/agenda.csv +++ b/ietf/templates/meeting/agenda.csv @@ -1,5 +1,5 @@ {% load humanize %}{% autoescape off %}{% load ietf_filters %}"Date","Start","End","Session","Room","Area","Acronym","Type","Description","Session ID","Agenda","Slides" {% for slot in timeslots %}{% ifchanged %}{% if slot.reg_info %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.registration.time_desc|slice:":4" }}","{{ slot.registration.time_desc|slice:"5:9" }}","Registration","{{ venue.reg_area_name }}","","","","{{ slot.registration.name }}","r{{slot.day_id}}","","" {% endif %}{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.break_info.time_desc|slice:":4" }}","{{ slot.break_info.time_desc|slice:"5:9" }}","Break","{{ venue.break_area_name }}","","","","{{ slot.break_info.name }}","b{{slot.time_id}}","","" -{% endif %}{% endif %}{% for session in slot.sessions_by_area %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.time_desc|slice:":4" }}","{{ slot.time_desc|slice:"5:9" }}","{{ slot.session_name }}","{{ session.info.room_id.room_name }}","{{ session.info.area|upper }}","{{ session.info.acronym }}","{{ session.info.group_type_str }}","{{ session.info.acronym_name }}","{{session.info.pk}}","{% if session.info.agenda_file %}http://datatracker.ietf.org/meeting/{{ meeting.num }}/agenda/{{ session.info.acronym }}-agenda/{% endif %}","{% if session.info.slides %}{% for slide in session.info.slides %}http://www.ietf.org/proceedings/{{ slide.file_loc }}{% if not forloop.last %}|{% endif %}{% endfor %}{% endif %}" +{% endif %}{% endif %}{% for session in slot.sessions_by_area %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.time_desc|slice:":4" }}","{{ slot.time_desc|slice:"5:9" }}","{{ slot.session_name }}","{{ session.info.room_id.room_name }}","{{ session.info.area|upper }}","{{ session.info.acronym }}","{{ session.info.group_type_str }}","{{ session.info.acronym_name }}","{{session.info.pk}}","{% if session.info.agenda_file %}http://datatracker.ietf.org/meeting/{{ meeting.num }}/agenda/{{ session.info.acronym }}/{% endif %}","{% if session.info.slides %}{% for slide in session.info.slides %}http://www.ietf.org/proceedings/{{ slide.file_loc }}{% if not forloop.last %}|{% endif %}{% endfor %}{% endif %}" {% endfor %}{% endfor %}{% endautoescape %} diff --git a/ietf/templates/registration/confirm.html b/ietf/templates/registration/confirm.html index cf014ac39..c2092cc76 100644 --- a/ietf/templates/registration/confirm.html +++ b/ietf/templates/registration/confirm.html @@ -6,7 +6,7 @@

Confirm account creation

{% if success %} -

Your account with login name '{{ email }}' has been created, using the password you have select.

+

Your account with login name '{{ email }}' has been created, using the password you have selected.

Now you can sign in

{% else %}

In order to complete the setup of your account with login name '{{ email }}', please set a password:

diff --git a/ietf/templates/submit/announce_new_version.txt b/ietf/templates/submit/announce_new_version.txt index 7c04ec35a..b3ea6ba29 100644 --- a/ietf/templates/submit/announce_new_version.txt +++ b/ietf/templates/submit/announce_new_version.txt @@ -1,4 +1,5 @@ -{% autoescape off %}New version (-{{ submission.revision }}) has been submitted for {{ submission.filename }}-{{ submission.revision }}.txt: +{% autoescape off %} +A new version (-{{ submission.revision }}) has been submitted for {{ submission.filename }}: http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt {% if msg %} {{ msg|striptags }} diff --git a/ietf/templates/submit/confirm_autopost.txt b/ietf/templates/submit/confirm_autopost.txt index 7651dcc6c..f79eefdb8 100644 --- a/ietf/templates/submit/confirm_autopost.txt +++ b/ietf/templates/submit/confirm_autopost.txt @@ -1,8 +1,18 @@ -{% autoescape off %}Follow this link to confirm your Auto-Post of -{{ draft.filename }}-{{ draft.revision }}: +{% autoescape off %} +Hi, -I-D Submission Tool URL: {{ confirm_url|safe }} +The IETF datatracker draft submission service has received your draft +{{ draft.filename }}-{{ draft.revision }}, and requires a +confirmation step in order to be able to complete the posting of +the draft. + +Please follow this link to the page where you can confirm the posting: + {{ confirm_url|safe }} + + +Best regards, + + The IETF Secretariat + through the draft submission service -Remember that you can cancel the submission from: -{{ status_url|safe }} {% endautoescape %} diff --git a/ietf/templates/submit/manual_post_mail.txt b/ietf/templates/submit/manual_post_mail.txt index 2b9291dba..5c06f9cc0 100644 --- a/ietf/templates/submit/manual_post_mail.txt +++ b/ietf/templates/submit/manual_post_mail.txt @@ -1,23 +1,31 @@ -{% autoescape off %}Manual posting has been requested for the following Internet-Draft: +{% autoescape off %} +Hi, -I-D Submission Tool URL: {{ url }} +Manual posting has been requested for the following Internet-Draft: -File name: {{ draft.filename }} -Version: {{ draft.revision }} -Submission date: {{ draft.submission_date }} -WG: {{ draft.group_acronym|default:"Individual Submission" }} {% if form.validation.warnings.group %}*Please note that this WG is not an active one*{% endif %} +I-D Submission Tool URL: + {{ url }} -Title: {{ draft.id_document_name }} -Document date: {{ draft.creation_date }} -Abstract: {{ draft.abstract }} -Pages: {{ draft.txt_page_count }} -File size: {{ draft.filesize|filesizeformat }} + File name : {{ draft.filename }} + Version : {{ draft.revision }} + Submission date : {{ draft.submission_date }} + WG : {{ draft.group_acronym|default:"Individual Submission" }} {% if form.validation.warnings.group %}*Please note that this WG is not an active one*{% endif %} -Submitter: {{ submitter.get_full_name }} <{{ submitter.email.1 }}> + Title : {{ draft.id_document_name }} + Document date : {{ draft.creation_date }} + Pages : {{ draft.txt_page_count }} + File size : {{ draft.filesize|filesizeformat }} -Authors: -{% for author in form.get_authors %}{{ author.get_full_name }} <{{ author.email.1 }}> + Submitter : {{ submitter.get_full_name }} <{{ submitter.email.1 }}> + + Abstract : {{ draft.abstract }} + + + Authors: +{% for author in form.get_authors %} {{ author.get_full_name }} <{{ author.email.1 }}> {% endfor %} + Comments to the secretariat: + {{ draft.comment_to_sec }} {% endautoescape %} diff --git a/ietf/templates/submit/request_full_url.txt b/ietf/templates/submit/request_full_url.txt index ce61b2646..ecb975303 100644 --- a/ietf/templates/submit/request_full_url.txt +++ b/ietf/templates/submit/request_full_url.txt @@ -1,5 +1,16 @@ -{% autoescape off %}Follow this link to get full access to the submission of -{{ submission.filename }}-{{ submission.revision }}: +{% autoescape off %} +Hi, + +The datatracker has received a request to send out the link to the URL where you +can confirm the submission of your draft {{ submission.filename }}-{{ submission.revision }}. + +Please follow this link to get full access to the submission page: + {{ url|safe }} + + +Best regards, + + The IETF Secretariat + through the draft submission service -{{ url|safe }} {% endautoescape %} diff --git a/ietf/templates/submit/submission_approval.txt b/ietf/templates/submit/submission_approval.txt index f61b726a4..51ea3e6b7 100644 --- a/ietf/templates/submit/submission_approval.txt +++ b/ietf/templates/submit/submission_approval.txt @@ -1,24 +1,33 @@ -{% autoescape off %}WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}. +{% autoescape off %} +Hi, -Go to this URL to approve the draft (note: you need to login to be -able to approve): +WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}. -https://{{ domain }}/submit/status/{{ draft.submission_id }}/{{ draft.submission_hash }}/ +To approve the draft, go to this URL (note: you need to login to be able to approve): + https://{{ domain }}/submit/status/{{ draft.submission_id }}/{{ draft.submission_hash }}/ -File name: {{ draft.filename }} -Version: {{ draft.revision }} -Submission date: {{ draft.submission_date }} -WG: {{ draft.group_acronym|default:"Individual Submission" }} + File name : {{ draft.filename }} + Version : {{ draft.revision }} + Submission date : {{ draft.submission_date }} + WG : {{ draft.group_acronym|default:"Individual Submission" }} -Title: {{ draft.id_document_name }} -Document date: {{ draft.creation_date }} -Abstract: {{ draft.abstract }} -Pages: {{ draft.txt_page_count }} -File size: {{ draft.filesize|filesizeformat }} + Title : {{ draft.id_document_name }} + Document date : {{ draft.creation_date }} + Pages : {{ draft.txt_page_count }} + File size : {{ draft.filesize|filesizeformat }} -Submitter: {{ submitter.get_full_name }} <{{ submitter.email_address }}> + Submitter : {{ submitter.get_full_name }} <{{ submitter.email_address }}> -Authors: -{% for author in authors %}{{ author.get_full_name }} <{{ author.email.1 }}> + Abstract : {{ draft.abstract }} + + + Authors: +{% for author in authors %} {{ author.get_full_name }} <{{ author.email.1 }}> {% endfor %} {% endautoescape %} + + +Best regards, + + The IETF Secretariat + through the draft submission service