diff --git a/ietf/secr/templates/proceedings/agenda.html b/ietf/secr/templates/proceedings/agenda.html index c573f0ff2..9c5fb4c6d 100644 --- a/ietf/secr/templates/proceedings/agenda.html +++ b/ietf/secr/templates/proceedings/agenda.html @@ -27,14 +27,14 @@ {{slot.name}} {% if slot.type.name != 'Session' %} - {% if slot.show_location %} - {{slot.get_location|escape}}{% endif %} + {% if slot.show_location %} - {{slot.get_location}}{% endif %} {% endif %} {% endifchanged %} {% if slot.type.name = 'Session' %} {% if slot.session.group %} - {% if slot.show_location %}{{slot.get_location|escape}}{% endif %} + {% if slot.show_location %}{{slot.get_location}}{% endif %} {{slot.session.group.parent.acronym|upper}} {% if slot.session.group.charter %}{{slot.session.group.acronym}} @@ -50,7 +50,7 @@ {% endif %} {% endif %} {% if slot.type.name = 'Plenary' %} - {% if slot.show_location %}{{slot.get_location|escape}}{% endif %} + {% if slot.show_location %}{{slot.get_location}}{% endif %} {% if slot.session.agenda %}Agenda diff --git a/ietf/templates/admin/group/group/send_sdo_reminder.html b/ietf/templates/admin/group/group/send_sdo_reminder.html index 8ba2ca94a..eee4886e9 100644 --- a/ietf/templates/admin/group/group/send_sdo_reminder.html +++ b/ietf/templates/admin/group/group/send_sdo_reminder.html @@ -9,7 +9,7 @@ {% block breadcrumbs %}{% if not is_popup %}
{% trans "Home" %} › - {{ app_label|capfirst|escape }} › + {{ app_label|capfirst|escape }} › {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} › {% trans "Send reminder" %}
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index 67e4eab34..1d1ee8d19 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -62,12 +62,12 @@ {% if p.pos.blocking and p.discuss %}

{{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }})

-
{{ p.discuss|wrap_text:80|escape }}
+
{{ p.discuss|wrap_text:80 }}
{% endif %} {% if p.comment %}

Comment ({{ p.comment_time|date:"Y-m-d" }})

-
{{ p.comment|wrap_text:80|escape }}
+
{{ p.comment|wrap_text:80 }}
{% endif %} {% endfor %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index ec66f774a..1a0e4d126 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -276,7 +276,7 @@

Abstract

-

{{ doc.abstract|escape }}

+

{{ doc.abstract }}

Authors

diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html index 36d3a556b..ec50b9cee 100644 --- a/ietf/templates/doc/document_history.html +++ b/ietf/templates/doc/document_history.html @@ -68,7 +68,7 @@ {{ e.time|date:"Y-m-d" }} {{ e.rev }} - {{ e.by|escape }} + {{ e.by }} {{ e.desc|format_history_text }} diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index 20278ae2f..23d331a16 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -8,14 +8,14 @@ {{doc.name}}-{{doc.rev}} [txt] -
{{ doc.title|escape }} +
{{ doc.title }} {% with doc.conflictdoc as conflictdoc %}
{{ conflictdoc.name }}-{{ conflictdoc.rev }} [txt] -
{{ conflictdoc.title|escape }} ({{ conflictdoc.stream }}: {{ conflictdoc.intended_std_level }}) +
{{ conflictdoc.title }} ({{ conflictdoc.stream }}: {{ conflictdoc.intended_std_level }}) {% if conflictdoc.note %}
Note: {{ conflictdoc.note|linebreaksbr }} {% endif %} @@ -26,7 +26,7 @@ diff --git a/ietf/templates/iesg/feed_item_description.html b/ietf/templates/iesg/feed_item_description.html index bd2a0b732..acc6d23b1 100644 --- a/ietf/templates/iesg/feed_item_description.html +++ b/ietf/templates/iesg/feed_item_description.html @@ -1,3 +1,3 @@ {# Copyright The IETF Trust 2008, All Rights Reserved #} -{{ obj.title|escape }}
-{{ obj.abstract|escape|truncatewords:50 }} +{{ obj.title }}
+{{ obj.abstract|truncatewords:50 }} diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html index 27e3d51d2..12780cb33 100644 --- a/ietf/templates/ipr/details.html +++ b/ietf/templates/ipr/details.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2007, All Rights Reserved #} -{% block title %}IPR Details - {{ ipr.title|escape }}{% endblock %} +{% block title %}IPR Details - {{ ipr.title }}{% endblock %} {% block pagehead %} diff --git a/ietf/templates/ipr/list_item.html b/ietf/templates/ipr/list_item.html index 2fc67ef57..03fa0b462 100644 --- a/ietf/templates/ipr/list_item.html +++ b/ietf/templates/ipr/list_item.html @@ -4,10 +4,10 @@ {{ ipr.ipr_id }} {% if ipr.status == 1 %} - {{ ipr.title|escape }} + {{ ipr.title }} {% else %} - {{ ipr.title|escape }} -
This IPR disclosure was removed at the request of the submitter. + {{ ipr.title }} +
This IPR disclosure was removed at the request of the submitter. {% endif %}
{% for item in ipr.updates.all %} @@ -29,7 +29,7 @@ * - {{ ipr.legacy_title_1|escape }} + {{ ipr.legacy_title_1 }} {% endif %} @@ -39,7 +39,7 @@ * - {{ ipr.legacy_title_2|escape }} + {{ ipr.legacy_title_2 }} {% endif %} diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html index d80feebe9..6ad58d49c 100644 --- a/ietf/templates/ipr/search_doc_result.html +++ b/ietf/templates/ipr/search_doc_result.html @@ -9,7 +9,7 @@ {{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
    • - "{{ ipr.title|escape }}" + "{{ ipr.title }}" {% endfor %} @@ -18,8 +18,7 @@ - Search result on {{ doc.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.document.title|escape }}"{% if not forloop.first %}{% if doc.related %}, that was {{ doc.relation|lower }} {{ doc.related.source|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.related.source.title }}"{% endif %} - {% endif %} + Search result on {{ doc.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.document.title }}"{% if not forloop.first %}{% if doc.related %}, that was {{ doc.relation|lower }} {{ doc.related.source|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.related.source.title }}"{% endif %}{% endif %} {% if doc.iprs %} @@ -27,7 +26,7 @@ {{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
    • - "{{ ipr.title|escape }}" + "{{ ipr.title }}" {% endfor %} {% else %} diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html index 30faa86f3..644dfce00 100644 --- a/ietf/templates/ipr/search_wg_result.html +++ b/ietf/templates/ipr/search_wg_result.html @@ -18,9 +18,9 @@ {% block iprlist %} {% for alias in docs %} - + - IPR that is related to {{ alias.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.document.title|escape }}"{% if alias.related %}, that was {{ alias.relation|lower }} {{ alias.related.source|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.related.source.title|escape }}"{% endif %} + IPR that is related to {{ alias.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.document.title }}"{% if alias.related %}, that was {{ alias.relation|lower }} {{ alias.related.source|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.related.source.title|escape }}"{% endif %} {% if alias.product_of_this_wg %} which is a product of Working Group {{ q }}{% endif %} @@ -32,10 +32,10 @@ {% for item in ipr.updates.all %} {% if item.updated.status == 1 %} - IPR disclosure ID# {{ item.updated.ipr_id }}, "{{ item.updated.title|escape }}" Updated by + IPR disclosure ID# {{ item.updated.ipr_id }}, "{{ item.updated.title }}" Updated by {% endif %} {% endfor %} - "{{ ipr.title|escape }}" + "{{ ipr.title }}" {% endfor %} diff --git a/ietf/templates/liaisons/feed_item_description.html b/ietf/templates/liaisons/feed_item_description.html index 7575aee35..771cdac5b 100644 --- a/ietf/templates/liaisons/feed_item_description.html +++ b/ietf/templates/liaisons/feed_item_description.html @@ -1,4 +1,4 @@ -{{ obj.body|truncatewords:"30"|wordwrap:"71"|escape|linebreaksbr }} +{{ obj.body|truncatewords:"30"|wordwrap:"71"|linebreaksbr }} {% with obj.attachments.all as attachments %}

    Attached Document{{ attachments|pluralize }}

    diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html index fab7722d7..24ad4830d 100644 --- a/ietf/templates/nomcom/announcements.html +++ b/ietf/templates/nomcom/announcements.html @@ -23,7 +23,7 @@ {% for m in regime.announcements %} {{ m.time|date:"Y-M-d" }} - {{ m.subject|escape }} + {{ m.subject }} {{ m.to_name }} {% endfor %} diff --git a/ietf/templates/nomcom/send_reminder_mail.html b/ietf/templates/nomcom/send_reminder_mail.html index fb8e15605..9bc7c9555 100644 --- a/ietf/templates/nomcom/send_reminder_mail.html +++ b/ietf/templates/nomcom/send_reminder_mail.html @@ -43,6 +43,6 @@

    The message that will be sent is as follows: {% if mail_template %}(Edit the message){% endif %}

    -
    {{ mail_template.content|wrap_text:80|escape }}
    +
    {{ mail_template.content|wrap_text:80 }}
    {% endblock %} diff --git a/ietf/templates/wginfo/milestones.html b/ietf/templates/wginfo/milestones.html index 7951811a2..bb04907a5 100644 --- a/ietf/templates/wginfo/milestones.html +++ b/ietf/templates/wginfo/milestones.html @@ -7,7 +7,7 @@ {% if milestone.resolved %}{{ milestone.resolved }}{% else %}{{ milestone.due|date:"M Y" }}{% endif %} -
    {{ milestone.desc|escape }}
    +
    {{ milestone.desc }}
    {% for d in milestone.docs.all %} {{ d.name }} {% endfor %}