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

Author: OleLaursen

ietf/liaisons/forms.py

@@ -361,7 +361,7 @@ def clean_organization(self):
         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()]

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%}

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%}

ietf/templates/idrfc/doc_ballot.html

@@ -1,6 +1,6 @@
-{% comment %}
+{% comment %}<!--
 Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
+All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions 
@@ -30,7 +30,7 @@
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-{% endcomment %}
+-->{% endcomment %}
 {% load ietf_filters %}
 <table class="ietf-ballot"><tr valign="top"><td class="left">
 
@@ -86,12 +86,12 @@ <h2 class="ballot_ad"><a name="{{pos.ad_name|slugify}}">{% if pos.is_old_ad %}[{
 
 {% ifequal pos.position "Discuss" %}
 <p><b>Discuss ({{pos.discuss_date}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>
-<pre>{{pos.discuss_text|fill:"80"|escape }}</pre>
+<pre>{{pos.discuss_text|wrap_text:80|escape }}</pre>
 {% endifequal %}
 
 {% if pos.comment_text %}
 <p><b>Comment ({{pos.comment_date}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>
-<pre>{{pos.comment_text|fill:"80"|escape }}</pre>
+<pre>{{pos.comment_text|wrap_text:80|escape }}</pre>
 {% endif %}
 {% endfor %}
 </td></tr></table>

ietf/templates/idrfc/doc_history.html

@@ -62,13 +62,13 @@
 <div id="commentS{{c.comment.id}}">{{ c.info.textSnippet|safe }}</div>
 <span class="comment_toggle" onclick="toggleComment({{c.comment.id}})" id="commentT{{c.comment.id}}">[show all]</span>
 <div id="commentF{{c.comment.id}}" style="display:none;">
-{{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
+{{ c.info.text|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
 </div>
 {% 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 %}
 </td>

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 %}

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 %}

ietf/templates/iesg/scribe_doc2.html

@@ -1,4 +1,4 @@
-{% comment %} 
+{% comment %}<!--
 Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
 
@@ -30,45 +30,29 @@
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-{% endcomment %}{% comment %}
+-->{% endcomment %}{% comment %}
 Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
 {% endcomment %}{% load ietf_filters %}
 
 <!-- ============================================================ -->
 <p><b>{{ doc.obj.document.filename }}</b></p>
 {% if doc.obj.ballot.active %}
   <ol>
-{% 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" %}
 <li><a name="{{doc.obj.document.filename}}+{{p.ad.plain_name|slugify}}+discuss">{{ p.ad.plain_name }}</a>: Discuss [{{ p.pos.discuss_time|date:"Y-m-d" }}]:<br>
-<pre>
-{{ p.pos.orig.discuss|fill:"80"|escape }}
-</pre>
+<pre>{{ p.pos.orig.discuss|wrap_text:80|escape }}</pre>
 </li>
 {% endif %}
 
 {% if p.pos and p.pos.comment %}
 <li><a name="{{doc.obj.document.filename}}+{{p.ad.plain_name|slugify}}+comment">{{ p.ad.plain_name }}</a>: Comment [{{ p.pos.comment_time|date:"Y-m-d" }}]:<br>
-    <pre>{{ p.pos.comment|fill:"80"|escape }}</pre>
+    <pre>{{ p.pos.comment|wrap_text:80|escape }}</pre>
 </li>
 {% endif %}
 {% endfor %}
 
-{% else %}
-
-{% for position in doc.obj.ballot.positions.all|dictsort:"ad.last_name" %}{% ifequal position.discuss 1 %}    <li><a name="{{doc.obj.document.filename}}+{{position.ad|slugify}}+discuss">{{ position.ad }}</a>:{% for item in doc.obj.ballot.discusses.all %}{% ifequal position.ad item.ad %} Discuss [{{ item.date }}]:<br>
-    <pre>
-    {{ item.text|fill:"80"|escape }} 
-    </pre>
-{% endifequal %}{% endfor %}{% endifequal %}{% for item in doc.obj.ballot.comments.all %}{% ifequal position.ad item.ad %}    <li><a name="{{doc.obj.document.filename}}+{{position.ad|slugify}}+comment">{{ position.ad }}</a>: Comment [{{ item.date }}]:<br>
-    <pre>{{ item.text|fill:"80"|escape }}</pre>
-{% endifequal %}{% endfor %}{% endfor %}
-
-{%endif %}
-
 </ol>
 
 {% endif%}

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 %}

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 %}