From 225e1a8e3aff9f2c3c0c533cae644c6128fdbf5a Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 27 Jul 2012 21:16:12 +0000 Subject: [PATCH] Reverting previous commit, going back to rev 4633. (Commit all made in error, only one file intended). - Legacy-Id: 4635 --- ietf/doc/admin.py | 6 --- ietf/idrfc/mirror_rfc_editor_queue.py | 1 - ietf/idtracker/templatetags/ietf_filters.py | 7 ---- .../community/public/notification_email.txt | 11 +++-- ietf/templates/meeting/agenda.csv | 2 +- ietf/templates/registration/confirm.html | 2 +- .../templates/submit/announce_new_version.txt | 3 +- ietf/templates/submit/confirm_autopost.txt | 20 +++------ ietf/templates/submit/manual_post_mail.txt | 36 +++++++--------- ietf/templates/submit/request_full_url.txt | 17 ++------ ietf/templates/submit/submission_approval.txt | 41 ++++++++----------- 11 files changed, 46 insertions(+), 100 deletions(-) diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py index 8189d8f24..f5a5dc28c 100644 --- a/ietf/doc/admin.py +++ b/ietf/doc/admin.py @@ -140,9 +140,3 @@ 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 0faf941cb..a3912e58f 100644 --- a/ietf/idrfc/mirror_rfc_editor_queue.py +++ b/ietf/idrfc/mirror_rfc_editor_queue.py @@ -213,7 +213,6 @@ 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 9dead8c4a..e42994981 100644 --- a/ietf/idtracker/templatetags/ietf_filters.py +++ b/ietf/idtracker/templatetags/ietf_filters.py @@ -466,13 +466,6 @@ 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 6db28028d..0e0c3214b 100644 --- a/ietf/templates/community/public/notification_email.txt +++ b/ietf/templates/community/public/notification_email.txt @@ -1,16 +1,15 @@ -{% autoescape off %}{% load ietf_filters %} +{% autoescape off %} Hello, -This is a notification from the {{ clist.long_name }}. +This is a notification from {{ clist.long_name }}. -Document: {{ notification.doc }}, -https://datatracker.ietf.org/doc/{{ notification.doc }} +Document: {{ notification.doc }} Change: -{{ notification.desc|textify|striptags }} +{{ notification.desc }} Best regards, - The datatracker draft tracking service + The datatracker login manager service (for the IETF Secretariat) {% endautoescape %} diff --git a/ietf/templates/meeting/agenda.csv b/ietf/templates/meeting/agenda.csv index 3e5770e7d..4bd84e3ac 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 }}/{% 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 }}-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 %}" {% endfor %}{% endfor %}{% endautoescape %} diff --git a/ietf/templates/registration/confirm.html b/ietf/templates/registration/confirm.html index c2092cc76..cf014ac39 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 selected.

+

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

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 b3ea6ba29..7c04ec35a 100644 --- a/ietf/templates/submit/announce_new_version.txt +++ b/ietf/templates/submit/announce_new_version.txt @@ -1,5 +1,4 @@ -{% autoescape off %} -A new version (-{{ submission.revision }}) has been submitted for {{ submission.filename }}: +{% autoescape off %}New version (-{{ submission.revision }}) has been submitted for {{ submission.filename }}-{{ submission.revision }}.txt: 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 f79eefdb8..7651dcc6c 100644 --- a/ietf/templates/submit/confirm_autopost.txt +++ b/ietf/templates/submit/confirm_autopost.txt @@ -1,18 +1,8 @@ -{% autoescape off %} -Hi, +{% autoescape off %}Follow this link to confirm your Auto-Post of +{{ draft.filename }}-{{ draft.revision }}: -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 +I-D Submission Tool URL: {{ confirm_url|safe }} +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 5c06f9cc0..2b9291dba 100644 --- a/ietf/templates/submit/manual_post_mail.txt +++ b/ietf/templates/submit/manual_post_mail.txt @@ -1,31 +1,23 @@ -{% autoescape off %} -Hi, +{% autoescape off %}Manual posting has been requested for the following Internet-Draft: -Manual posting has been requested for the following Internet-Draft: +I-D Submission Tool URL: {{ url }} -I-D Submission Tool URL: - {{ url }} +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 %} - 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 %} +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.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 }}> +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 ecb975303..ce61b2646 100644 --- a/ietf/templates/submit/request_full_url.txt +++ b/ietf/templates/submit/request_full_url.txt @@ -1,16 +1,5 @@ -{% 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 +{% autoescape off %}Follow this link to get full access to the submission of +{{ submission.filename }}-{{ submission.revision }}: +{{ url|safe }} {% endautoescape %} diff --git a/ietf/templates/submit/submission_approval.txt b/ietf/templates/submit/submission_approval.txt index 51ea3e6b7..f61b726a4 100644 --- a/ietf/templates/submit/submission_approval.txt +++ b/ietf/templates/submit/submission_approval.txt @@ -1,33 +1,24 @@ -{% autoescape off %} -Hi, +{% autoescape off %}WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}. -WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}. +Go to this URL to approve the draft (note: you need to login to be +able to approve): -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 }}/ +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 }} - Pages : {{ draft.txt_page_count }} - File size : {{ draft.filesize|filesizeformat }} +Title: {{ draft.id_document_name }} +Document date: {{ draft.creation_date }} +Abstract: {{ draft.abstract }} +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 }}> - Abstract : {{ draft.abstract }} - - - Authors: -{% for author in authors %} {{ author.get_full_name }} <{{ author.email.1 }}> +Authors: +{% for author in authors %}{{ author.get_full_name }} <{{ author.email.1 }}> {% endfor %} {% endautoescape %} - - -Best regards, - - The IETF Secretariat - through the draft submission service