Fixed some s!<br/>!<br>! and s!</li>!<li>! in the scribe template templates, and also where html escaping is and isn't applied.

 - Legacy-Id: 5086

Author: levkowetz

ietf/templates/iesg/scribe_doc.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,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 %}{% comment %}
+-->{% endcomment %}{% comment %}
 Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
 {% endcomment %}
 {% load ietf_filters %}
@@ -54,8 +54,8 @@
             {% endif %}
         {% endwith %}
         <br>Token: {{ doc.obj.ad.plain_name|escape }} ({{doc.obj.area_acronym}} area)   
-        {% if doc.obj.note %}{# note: note is not escaped #}  
-            <br>Note: {{ doc.obj.note|safe }}
+        {% if doc.obj.note %}
+            <br>Note: {{ doc.obj.note }}
         {% endif %}
         {% for ipr in doc.obj.ipr %}
             {% ifequal ipr.ipr.status 1 %}
@@ -70,13 +70,13 @@
                     {% if p.discuss %}
                         <li>
                         <a href="#{{doc.obj.name}}+{{p.ad|slugify}}+discuss">{{ p.ad }}: Discuss [{{ p.discuss_time }}]</a>:
-                        <br>{{ p.discuss }}
+                        <br>{{ p.discuss|escape }}
                         </li>
                     {% endif %}
                     {% if p.comment %}
                         <li>
                         <a href="#{{doc.obj.name}}+{{p.ad|slugify}}+comment">{{ p.ad }}: Comment [{{ p.comment_time }}]</a>:
-                        <br>{{ p.comment }}
+                        <br>{{ p.comment|escape }}
                         </li>
                     {% endif %}
                 {% endif %}            

ietf/templates/iesg/scribe_doc2.html

@@ -44,19 +44,19 @@
         {% if p.pos and p.discuss %}
            <li>
             <a name="{{doc.obj.name}}+{{p.ad|slugify}}+discuss">{{ p.ad }}: Discuss [{{ p.discuss_time }}]</a>:
-            <br/>{{ p.discuss }}
-            </li>
+            <br>{{ p.discuss|escape }}
+            <li>
             <a name="{{doc.obj.name}}+{{p.ad.plain_name|slugify}}+discuss">{{ p.ad.plain_name }}: Discuss [{{ p.discuss_time }}]</a>:
-            <br><pre>{{ p.discuss|wrap_text:80 }}</pre>
+            <br><pre>{{ p.discuss|wrap_text:80|escape }}</pre>
 
         {% endif %}
         {% if p.pos and p.comment %}
             <li>
             <a name="{{doc.obj.name}}+{{p.ad|slugify}}+comment">{{ p.ad }}: Comment [{{ p.comment_time }}]</a>:
-            <br/>{{ p.comment }}
-            </li>
+            <br>{{ p.comment|escape }}
+            <li>
             <a name="{{doc.obj.name}}+{{p.ad.plain_name|slugify}}+comment">{{ p.ad.plain_name }}: Comment [{{ p.comment_time }}]</a>:
-            <br><pre>{{ p.comment|wrap_text:80 }}</pre>
+            <br><pre>{{ p.comment|wrap_text:80|escape }}</pre>
         {% endif %}
     {% endfor %}
     </ul>