Reverted a number of changes to the scribe template which made life more difficult for the scribe.

levkowetz · levkowetz · commit 32c7740b5520 · 2012-08-29T00:03:31.000Z
- Legacy-Id: 4820
diff --git a/ietf/templates/iesg/scribe_doc.html b/ietf/templates/iesg/scribe_doc.html
@@ -53,7 +53,7 @@
                 <a href="http://www.ietf.org/id/{{doc.obj.canonical_name}}-{{doc.obj.rev}}.txt">[txt]</a>
             {% endif %}
         {% endwith %}
-        <br/>Token: {{ doc.obj.ad|escape }} ({{doc.obj.area_acronym}} area)   
+        <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 }}
         {% endif %}
diff --git a/ietf/templates/iesg/scribe_doc2.html b/ietf/templates/iesg/scribe_doc2.html
@@ -39,21 +39,23 @@
 <p><b>{{ doc.obj.name }}</b></p>
 
 {% if doc.obj.active_ballot %}
+{% autoescape off %}
     <ul>
     {% for p in doc.obj.active_ballot.active_ad_positions.values %}
         {% 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 }}
+            <a name="{{doc.obj.name}}+{{p.ad.plain_name|slugify}}+discuss">{{ p.ad.plain_name }}: Discuss [{{ p.discuss_time }}]</a>:
+            <br/><pre>{{ p.discuss }}</pre>
             </li>
         {% 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 }}
+            <a name="{{doc.obj.name}}+{{p.ad.plain_name|slugify}}+comment">{{ p.ad.plain_name }}: Comment [{{ p.comment_time }}]</a>:
+            <br/><pre>{{ p.comment }}</pre>
             </li>
         {% endif %}
     {% endfor %}
     </ul>
+{% endautoescape %}
 {% endif%}
diff --git a/ietf/templates/iesg/scribe_template.html b/ietf/templates/iesg/scribe_template.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,11 +30,10 @@
 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 %}<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+{% endcomment %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- Please don't change the doctype.  It messes up things for the scribe. -->
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
