Merged Tero's safe/escape template fixes (Django 1.x)

 - Legacy-Id: 1820

Author: pasieronen

ietf/templates/idrfc/doc_main_id.html

@@ -103,7 +103,7 @@ <h1 style="margin-top:0;">{{ doc.title|escape }}<br/>{{ doc.draft_name_and_revis
 <table id="metatable">
 <tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}</td></tr>
 <tr><td>State:</td><td> 
-{{ doc.friendly_state }}
+{{ doc.friendly_state|safe }}
 {% if doc.rfc_editor_state %}<br />RFC Editor State: {{ doc.rfc_editor_state|escape }} {% endif %}
 {% if doc.replaces %}<br />Replaces {% for rep in doc.replaces %}<a href="/doc/{{rep}}/">{{rep}}</a> {% endfor %}{% endif %}
 </td></tr>

ietf/templates/iesg/agenda_doc.html

@@ -69,7 +69,7 @@
 </td></tr>
 
 {% if doc.obj.note %} {# note: note is not escaped #}
-<tr><td></td><td></td><td>Note: {{ doc.obj.note }}</td></tr>
+<tr><td></td><td></td><td>Note: {{ doc.obj.note|safe }}</td></tr>
 {% endif %}
 
 {% if doc.obj.draft.ipr.all %}