{{ body|maybewordwrap }}
+ Body
+{{ body|maybewordwrap }}
{{ p.discuss|linkify|urlize_ietf_docs }}
+ {{ p.discuss|urlize_ietf_docs|linkify }}
{{ p.comment|linkify|urlize_ietf_docs }}
+ {{ p.comment|urlize_ietf_docs|linkify }}
{{ p.discuss|linkify|urlize_ietf_docs }}
+ {{ p.discuss|urlize_ietf_docs|linkify }}
{{ p.comment|linkify|urlize_ietf_docs }}
+ {{ p.comment|urlize_ietf_docs|linkify }}
{{ content|maybewordwrap|linkify|urlize_ietf_docs }}
+ {{ content|maybewordwrap|urlize_ietf_docs|linkify }}
{{ content|maybewordwrap|linkify|urlize_ietf_docs }}
+ {{ content|maybewordwrap|urlize_ietf_docs|linkify }}
{{ content|maybewordwrap|linkify|urlize_ietf_docs }}
+ {{ content|maybewordwrap|urlize_ietf_docs|linkify }}
{% endif %}
{% else %}
Not available as plain text.
@@ -136,4 +136,4 @@
{% block js %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index 2e307ec6a..bf249ff53 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -47,7 +47,7 @@
{{ content|maybewordwrap|linkify|urlize_ietf_docs }}
+ {{ content|maybewordwrap|urlize_ietf_docs|linkify }}
{{ content|maybewordwrap|linkify|urlize_ietf_docs }}
+ {{ content|maybewordwrap|urlize_ietf_docs|linkify }}
{{ text|linkify|urlize_ietf_docs }}{% endif %}
+ {% if text %}{{ text|urlize_ietf_docs|linkify }}{% endif %}
{% if can_edit %}
@@ -32,4 +32,4 @@
{% endif %}
{% endfor %}
{% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/doc/downref.html b/ietf/templates/doc/downref.html
index c25dc52b3..b82b5027c 100644
--- a/ietf/templates/doc/downref.html
+++ b/ietf/templates/doc/downref.html
@@ -18,7 +18,7 @@
- {{ area.description|linkify|urlize_ietf_docs|safe }}
+ {{ area.description|urlize_ietf_docs|linkify|safe }}
, no surrounding necessary: #}
- {{ group.charter_text|linkify|urlize_ietf_docs|linebreaks }}
+ {{ group.charter_text|urlize_ietf_docs|linkify|linebreaks }}
{% else %}
@@ -41,4 +41,4 @@
{% endblock %}
{% block js %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index 4fbb6e06a..528678118 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -60,7 +60,7 @@
{% endif %}
{% if doc.note %}
Referenced RFC
- Internet-Draft making the reference
+ Internet-Draft making the reference
- Note: {{ doc.note|linkify|urlize_ietf_docs|linebreaksbr }}
+ Note: {{ doc.note|urlize_ietf_docs|linkify|linebreaksbr }}
{% endif %}
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index 5a647baf8..cc253ee7b 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -19,7 +19,7 @@
@@ -314,7 +312,7 @@
- Requested rev.
+ Requested revision
{% if review_req.requested_rev %}
{{ review_req.requested_rev }}
@@ -299,12 +299,10 @@
- Reviewed rev.
+ Reviewed revision
-
- {{ assignment.reviewed_rev }}
-
+ {{ assignment.reviewed_rev }}
{% if assignment.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}
- Review result
+ Result
{{ assignment.result.name }}
@@ -326,7 +324,7 @@
- Review completed:
+ Completed
{{ assignment.completed_on|date:"Y-m-d" }}
@@ -343,4 +341,4 @@
Assign reviewer
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/doc/shepherd_writeup.html b/ietf/templates/doc/shepherd_writeup.html
index 7c28c49dc..8cf99aff0 100644
--- a/ietf/templates/doc/shepherd_writeup.html
+++ b/ietf/templates/doc/shepherd_writeup.html
@@ -11,11 +11,11 @@
{{ doc.canonical_name }}-{{ doc.rev }}
- {{writeup|linkify|urlize_ietf_docs|wordwrap:"80"}}
+ {{writeup|maybewordwrap|urlize_ietf_docs|linkify}}
{% if can_edit %}
Edit
{% endif %}
Back
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/group/active_areas.html b/ietf/templates/group/active_areas.html
index 38153c1c3..d3fe45f45 100644
--- a/ietf/templates/group/active_areas.html
+++ b/ietf/templates/group/active_areas.html
@@ -50,7 +50,7 @@
{% if area.description %}
{{ rpt.desc|default:"(none)"|linkify|urlize_ietf_docs }}
+ {{ rpt.desc|default:"(none)"|urlize_ietf_docs|linkify }}
{{ rpt.desc|default:"(none)"|linkify|urlize_ietf_docs }}
+ {{ rpt.desc|default:"(none)"|urlize_ietf_docs|linkify }}
{% endif %}{% endif %}
{% endfor %}
{% endif %}
@@ -309,7 +309,7 @@
{{ group.type.desc.title }}
{# the linebreaks filter adds
{% if requested_close or group.state_id == "conclude" %}Final{% endif %}
@@ -333,4 +333,4 @@
{% endif %}
{% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html
index e9cc486cb..c2fe7e0ae 100644
--- a/ietf/templates/group/group_about_status.html
+++ b/ietf/templates/group/group_about_status.html
@@ -28,7 +28,7 @@
{% endif %}
-
{{ status_update.desc|default:"(none)"|linkify|urlize_ietf_docs }}
+ {{ status_update.desc|default:"(none)"|urlize_ietf_docs|linkify }}
{% if can_provide_status_update %}
Status update for {{ group.type.name }} {{ group.acronym }} at {{ meeting }}
- {{ status_update.desc|default:"(none)"|linkify|urlize_ietf_docs }}
+ {{ status_update.desc|default:"(none)"|urlize_ietf_docs|linkify }}
Back
{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html
index ab2ddb354..9fd1e71f3 100644
--- a/ietf/templates/group/group_base.html
+++ b/ietf/templates/group/group_base.html
@@ -9,12 +9,12 @@
{% block content %}
{% origin %}
- {{ group.name }} ({{ group.acronym }})
{% if group.state_id == "dormant" or group.state_id == "conclude" %}
- Concluded {{ group.type.name }}
+ Concluded {{ group.type.name }}
{% endif %}
- {% if group.state_id == "replaced" %}Replaced {{ group.type.name }}{% endif %}
- {% if group.state_id == "proposed" %}Proposed {{ group.type.name }}{% endif %}
+ {% if group.state_id == "replaced" %}Replaced {{ group.type.name }}{% endif %}
+ {% if group.state_id == "proposed" %}Proposed {{ group.type.name }}{% endif %}
+ {{ group.name }} ({{ group.acronym }})