From 9f880a3aab08a54dd40ccf2a852535cd9fea0bf8 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Mon, 30 Apr 2012 13:36:56 +0000 Subject: [PATCH] Port all still relevant changes between trunk before migration and charter branch to new trunk (mostly various minor template fixes), except 0.24 version of draft.py tool which has some interfaces changes that requires changes in the submit tool - Legacy-Id: 4341 --- ietf/liaisons/forms.py | 2 +- ietf/templates/idrfc/ballot_writeup.txt | 4 ++-- ietf/templates/idrfc/change_notice.txt | 2 ++ ietf/templates/idrfc/doc_ballot.html | 10 ++++---- ietf/templates/idrfc/doc_history.html | 4 ++-- ietf/templates/idrfc/id_expired_email.txt | 3 ++- ietf/templates/idrfc/last_call_request.txt | 2 ++ ietf/templates/iesg/scribe_doc2.html | 24 ++++--------------- .../annotation_tags_updated_mail.txt | 2 ++ .../ietfworkflows/state_updated_mail.txt | 2 ++ .../ietfworkflows/stream_updated_mail.txt | 2 ++ ietf/templates/ipr/details.txt | 3 ++- ietf/templates/submit/announce_to_authors.txt | 10 +++++++- ietf/templates/submit/announce_to_lists.txt | 21 +++++++++------- ietf/templates/submit/confirm_autopost.txt | 5 ++-- ietf/templates/submit/request_full_url.txt | 5 ++-- ietf/templates/submit/submission_approval.txt | 3 ++- .../notexistsdelegate_delegate_email.txt | 3 ++- .../notexistsdelegate_secretariat_email.txt | 3 ++- .../notexistsdelegate_wgchairs_email.txt | 3 ++- 20 files changed, 63 insertions(+), 50 deletions(-) diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py index 0ed432eb6..0cfc391f7 100644 --- a/ietf/liaisons/forms.py +++ b/ietf/liaisons/forms.py @@ -361,7 +361,7 @@ class OutgoingLiaisonForm(LiaisonForm): person = self.fake_person or self.person for i in self.hm.get_entities_for_person(person): all_entities += i[1] - # If the from entity is one in wich the user has full privileges the to entity could be anyone + # If the from entity is one in which the user has full privileges the to entity could be anyone if from_code in [i[0] for i in all_entities]: return to_code sdo_codes = ['sdo_%s' % i.sdo.pk for i in person.liaisonmanagers_set.all().distinct()] diff --git a/ietf/templates/idrfc/ballot_writeup.txt b/ietf/templates/idrfc/ballot_writeup.txt index 2ffd650f2..df5814020 100644 --- a/ietf/templates/idrfc/ballot_writeup.txt +++ b/ietf/templates/idrfc/ballot_writeup.txt @@ -1,4 +1,4 @@ - +{% autoescape off %} Technical Summary Relevant content can frequently be found in the abstract @@ -47,4 +47,4 @@ IESG Note IANA Note (Insert IANA Note here or remove section) - +{% endautoescape%} diff --git a/ietf/templates/idrfc/change_notice.txt b/ietf/templates/idrfc/change_notice.txt index 9f2b9d28a..bc6e62b62 100644 --- a/ietf/templates/idrfc/change_notice.txt +++ b/ietf/templates/idrfc/change_notice.txt @@ -1,6 +1,8 @@ +{% autoescape off %} Please DO NOT reply to this email. I-D: {{ doc.file_tag|safe }} ID Tracker URL: {{ url }} {{ text }} +{% endautoescape%} diff --git a/ietf/templates/idrfc/doc_ballot.html b/ietf/templates/idrfc/doc_ballot.html index af7f74e99..9a985088f 100644 --- a/ietf/templates/idrfc/doc_ballot.html +++ b/ietf/templates/idrfc/doc_ballot.html @@ -1,6 +1,6 @@ -{% comment %} +{% comment %}{% endcomment %} {% load ietf_filters %}
@@ -86,12 +86,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {% ifequal pos.position "Discuss" %}

Discuss ({{pos.discuss_date}})

-
{{pos.discuss_text|fill:"80"|escape }}
+
{{pos.discuss_text|wrap_text:80|escape }}
{% endifequal %} {% if pos.comment_text %}

Comment ({{pos.comment_date}})

-
{{pos.comment_text|fill:"80"|escape }}
+
{{pos.comment_text|wrap_text:80|escape }}
{% endif %} {% endfor %}
diff --git a/ietf/templates/idrfc/doc_history.html b/ietf/templates/idrfc/doc_history.html index 8ec6b72e1..220770ac0 100644 --- a/ietf/templates/idrfc/doc_history.html +++ b/ietf/templates/idrfc/doc_history.html @@ -62,13 +62,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{{ c.info.textSnippet|safe }}
[show all] {% else %} {% if c.info.dontmolest %} {{ c.info.text|safe }} {% else %} -{{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }} +{{ c.info.text|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }} {% endif %} {% endif %} diff --git a/ietf/templates/idrfc/id_expired_email.txt b/ietf/templates/idrfc/id_expired_email.txt index 5eda3f0ac..b91ea35a4 100644 --- a/ietf/templates/idrfc/id_expired_email.txt +++ b/ietf/templates/idrfc/id_expired_email.txt @@ -1,6 +1,7 @@ -{{ doc.file_tag|safe }} was just expired. +{% autoescape off %}{{ doc.file_tag|safe }} was just expired. This draft is in the state "{{ state }}" in the ID Tracker. Thanks, IETF Secretariat. +{% endautoescape %} diff --git a/ietf/templates/idrfc/last_call_request.txt b/ietf/templates/idrfc/last_call_request.txt index 35a6c0e48..b96779edb 100644 --- a/ietf/templates/idrfc/last_call_request.txt +++ b/ietf/templates/idrfc/last_call_request.txt @@ -1,4 +1,6 @@ +{% autoescape off %} Last Call Request has been submitted for {% for d in docs %}{{ d.file_tag|safe }} {% endfor %} {{ doc_url|safe }} +{% endautoescape %} \ No newline at end of file diff --git a/ietf/templates/iesg/scribe_doc2.html b/ietf/templates/iesg/scribe_doc2.html index 6d4718cb7..233da157e 100644 --- a/ietf/templates/iesg/scribe_doc2.html +++ b/ietf/templates/iesg/scribe_doc2.html @@ -1,4 +1,4 @@ -{% comment %} +{% comment %}{% endcomment %}{% comment %} Some parts Copyright (c) 2009 The IETF Trust, all rights reserved. {% endcomment %}{% load ietf_filters %} @@ -38,37 +38,21 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.

{{ doc.obj.document.filename }}

{% if doc.obj.ballot.active %}
    -{% if USE_DB_REDESIGN_PROXY_CLASSES %} - {% for p in doc.obj.active_positions|dictsort:"ad.last_name" %} {% if p.pos and p.pos.pos_id == "discuss" %}
  1. {{ p.ad.plain_name }}: Discuss [{{ p.pos.discuss_time|date:"Y-m-d" }}]:
    -
    -{{ p.pos.orig.discuss|fill:"80"|escape }}
-
    +
    {{ p.pos.orig.discuss|wrap_text:80|escape }}
    2. {% endif %} {% if p.pos and p.pos.comment %}
  2. {{ p.ad.plain_name }}: Comment [{{ p.pos.comment_time|date:"Y-m-d" }}]:
    - 
    {{ p.pos.comment|fill:"80"|escape }}
    + 
    {{ p.pos.comment|wrap_text:80|escape }}
    3. {% endif %} {% endfor %} -{% else %} - -{% for position in doc.obj.ballot.positions.all|dictsort:"ad.last_name" %}{% ifequal position.discuss 1 %}
  3. {{ position.ad }}:{% for item in doc.obj.ballot.discusses.all %}{% ifequal position.ad item.ad %} Discuss [{{ item.date }}]:
    - 
    -    {{ item.text|fill:"80"|escape }} 
-
    -{% endifequal %}{% endfor %}{% endifequal %}{% for item in doc.obj.ballot.comments.all %}{% ifequal position.ad item.ad %}
  4. {{ position.ad }}: Comment [{{ item.date }}]:
    - 
    {{ item.text|fill:"80"|escape }}
    -{% endifequal %}{% endfor %}{% endfor %} - -{%endif %} -
{% endif%} diff --git a/ietf/templates/ietfworkflows/annotation_tags_updated_mail.txt b/ietf/templates/ietfworkflows/annotation_tags_updated_mail.txt index 5c755817c..dafe2376b 100644 --- a/ietf/templates/ietfworkflows/annotation_tags_updated_mail.txt +++ b/ietf/templates/ietfworkflows/annotation_tags_updated_mail.txt @@ -1,3 +1,4 @@ +{% autoescape off %} The annotation tags of document {{ doc }} have been updated. See more information below. Annotation tags set: {{ entry.setted }} @@ -7,3 +8,4 @@ Author of the change: {{ entry.person }} Comment: {{ entry.comment }} +{% endautoescape %} diff --git a/ietf/templates/ietfworkflows/state_updated_mail.txt b/ietf/templates/ietfworkflows/state_updated_mail.txt index 95e1d7dd6..074b93431 100644 --- a/ietf/templates/ietfworkflows/state_updated_mail.txt +++ b/ietf/templates/ietfworkflows/state_updated_mail.txt @@ -1,3 +1,4 @@ +{% autoescape off %} The state of document {{ doc }} has been updated. See more information below. Previous state: {{ entry.from_state }} @@ -7,3 +8,4 @@ Author of the change: {{ entry.person }} Comment: {{ entry.comment }} +{% endautoescape %} diff --git a/ietf/templates/ietfworkflows/stream_updated_mail.txt b/ietf/templates/ietfworkflows/stream_updated_mail.txt index 23299af5a..b98640b88 100644 --- a/ietf/templates/ietfworkflows/stream_updated_mail.txt +++ b/ietf/templates/ietfworkflows/stream_updated_mail.txt @@ -1,3 +1,4 @@ +{% autoescape off %} The stream of document {{ doc }} has been updated. See more information below. Previous stream: {{ entry.from_stream }} @@ -7,3 +8,4 @@ Author of the change: {{ entry.person }} Comment: {{ entry.comment }} +{% endautoescape %} diff --git a/ietf/templates/ipr/details.txt b/ietf/templates/ipr/details.txt index a0be2af85..afb4d6439 100644 --- a/ietf/templates/ipr/details.txt +++ b/ietf/templates/ipr/details.txt @@ -1,4 +1,4 @@ -{% load ietf_filters %}IPR Title: {{ ipr.title|safe }} +{% autoescape off %}{% load ietf_filters %}IPR Title: {{ ipr.title|safe }} Section I: Patent Holder/Applicant ("Patent Holder") @@ -76,3 +76,4 @@ Section VII: Contact Information of Submitter of this Form (if different from IE Section VIII: Other Note(s) {{ ipr.other_notes|safe }} +{% endautoescape %} \ No newline at end of file diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt index b6f4c8878..ae1af3b7d 100644 --- a/ietf/templates/submit/announce_to_authors.txt +++ b/ietf/templates/submit/announce_to_authors.txt @@ -1,4 +1,7 @@ -A new version of I-D, {{ submission.filename }}-{{ submission.revision }}.txt has been successfully submitted by {{ submitter }} and posted to the IETF repository. +{% autoescape off %} +A new version of I-D, {{ submission.filename }}-{{ submission.revision }}.txt +has been successfully submitted by {{ submitter }} and posted to the +IETF repository. Filename: {{ submission.filename }} Revision: {{ submission.revision }} @@ -6,6 +9,10 @@ Title: {{ submission.id_document_name }} Creation date: {{ submission.creation_date|date:"Y-m-d" }} WG ID: {{ wg }} Number of pages: {{ submission.txt_page_count }} +URL: http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt +Status: http://datatracker.ietf.org/doc/{{ submission.filename }} +Htmlized: http://tools.ietf.org/html/submission.filename }}-{{ submission.revision }} +{% ifnotequal submission.revision "00" %}Diff: http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }}{% endifnotequal %} Abstract: {{ submission.abstract }} @@ -13,3 +20,4 @@ Abstract: {{ submission.comment_to_sec|default:"" }} The IETF Secretariat +{% endautoescape %} \ No newline at end of file diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt index 6236b4316..a0fb84dd3 100644 --- a/ietf/templates/submit/announce_to_lists.txt +++ b/ietf/templates/submit/announce_to_lists.txt @@ -1,5 +1,6 @@ {% autoescape off %} -A New Internet-Draft is available from the on-line Internet-Drafts directories.{% if submission.group_acronym %} This draft is a work item of the {{ submission.group_acronym.group_acronym.name }} Working Group of the IETF.{% endif %} +A New Internet-Draft is available from the on-line Internet-Drafts directories. +{% if submission.group_acronym %} This draft is a work item of the {{ submission.group_acronym.group_acronym.name }} Working Group of the IETF.{% endif %} Title : {{ submission.id_document_name }} Author(s) : {% for author in authors %}{{ author }}{% if not forloop.last %} @@ -8,17 +9,19 @@ A New Internet-Draft is available from the on-line Internet-Drafts directories.{ Pages : {{ submission.txt_page_count }} Date : {{ submission.submission_date|date:"Y-m-d" }} +Abstract: {{ submission.abstract }} -A URL for this Internet-Draft is: -http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt +The IETF datatracker status page for this draft is: +https://datatracker.ietf.org/doc/{{ submission.filename }} + +There's also a htmlized version available at: +http://tools.ietf.org/html/submission.filename }}-{{ submission.revision }} +{% if submission.revision != "00" %} +A diff from previous version is available at: +http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }} +{% endif %} Internet-Drafts are also available by anonymous FTP at: ftp://ftp.ietf.org/internet-drafts/ - -This Internet-Draft can be retrieved at: -ftp://ftp.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt - -The IETF datatracker page for this Internet-Draft is: -https://datatracker.ietf.org/doc/{{ submission.filename }}/ {% endautoescape %} diff --git a/ietf/templates/submit/confirm_autopost.txt b/ietf/templates/submit/confirm_autopost.txt index 302ded0cc..7651dcc6c 100644 --- a/ietf/templates/submit/confirm_autopost.txt +++ b/ietf/templates/submit/confirm_autopost.txt @@ -1,7 +1,8 @@ -Follow this link to confirm your Auto-Post of -I-D {{ draft.filename }}-{{ draft.revision }}: +{% autoescape off %}Follow this link to confirm your Auto-Post of +{{ draft.filename }}-{{ draft.revision }}: 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/request_full_url.txt b/ietf/templates/submit/request_full_url.txt index 63446a9c4..ce61b2646 100644 --- a/ietf/templates/submit/request_full_url.txt +++ b/ietf/templates/submit/request_full_url.txt @@ -1,4 +1,5 @@ -Follow this link to get full access to the submission of -I-D {{ submission.filename }}-{{ submission.revision }}: +{% 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 ec515424a..f61b726a4 100644 --- a/ietf/templates/submit/submission_approval.txt +++ b/ietf/templates/submit/submission_approval.txt @@ -1,4 +1,4 @@ -WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}. +{% autoescape off %}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): @@ -21,3 +21,4 @@ Submitter: {{ submitter.get_full_name }} <{{ submitter.email_address }}> Authors: {% for author in authors %}{{ author.get_full_name }} <{{ author.email.1 }}> {% endfor %} +{% endautoescape %} diff --git a/ietf/templates/wgchairs/notexistsdelegate_delegate_email.txt b/ietf/templates/wgchairs/notexistsdelegate_delegate_email.txt index 74ae07117..de2318a93 100644 --- a/ietf/templates/wgchairs/notexistsdelegate_delegate_email.txt +++ b/ietf/templates/wgchairs/notexistsdelegate_delegate_email.txt @@ -1,4 +1,4 @@ -{{ chair }} as a WG Chair of {{ wg }} wants to add you as a {{ wg }} {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}. +{% autoescape off %}{{ chair }} as a WG Chair of {{ wg }} wants to add you as a {{ wg }} {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}. You don't have an user/password to log into the datatracker so you must contact the Secretariat at iesg-secretary@ietf.org in order to get your credentials. @@ -7,3 +7,4 @@ When you get your credentials, please inform {{ chair }} at {{ chair.email.1 }} so he/she can finish the designate process. Thank you. +{% endautoescape %} diff --git a/ietf/templates/wgchairs/notexistsdelegate_secretariat_email.txt b/ietf/templates/wgchairs/notexistsdelegate_secretariat_email.txt index 6f2e59fac..27edacc11 100644 --- a/ietf/templates/wgchairs/notexistsdelegate_secretariat_email.txt +++ b/ietf/templates/wgchairs/notexistsdelegate_secretariat_email.txt @@ -1,4 +1,4 @@ -{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email +{% autoescape off %}{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email {{ delegate_email }} as a {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}. This person don't have an user/password to log into the datatracker so @@ -12,3 +12,4 @@ already exists in the system but they can not log in. {{ person.pk }} - {{ person }} {% endfor %} {% endif %} +{% endautoescape %} \ No newline at end of file diff --git a/ietf/templates/wgchairs/notexistsdelegate_wgchairs_email.txt b/ietf/templates/wgchairs/notexistsdelegate_wgchairs_email.txt index e47c161b5..477111dcf 100644 --- a/ietf/templates/wgchairs/notexistsdelegate_wgchairs_email.txt +++ b/ietf/templates/wgchairs/notexistsdelegate_wgchairs_email.txt @@ -1,4 +1,4 @@ -{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email +{% autoescape off %}{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email {{ delegate_email }} as a {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}. This person don't have an user/password to log into the datatracker so @@ -9,3 +9,4 @@ When he/she gets her credentials then he/she will send an email to {{ chair }} at {{ chair.email.1 }}. {{ chair }} could then assign this person as {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}. +{% endautoescape%} \ No newline at end of file