diff --git a/ietf/templates/doc/add_comment.html b/ietf/templates/doc/add_comment.html index e8afc5456..94637da19 100644 --- a/ietf/templates/doc/add_comment.html +++ b/ietf/templates/doc/add_comment.html @@ -18,7 +18,7 @@ - Back + Back diff --git a/ietf/templates/doc/bofreq/change_editors.html b/ietf/templates/doc/bofreq/change_editors.html index 0f724008c..ab6a3541e 100644 --- a/ietf/templates/doc/bofreq/change_editors.html +++ b/ietf/templates/doc/bofreq/change_editors.html @@ -21,7 +21,7 @@ - Back + Back diff --git a/ietf/templates/doc/bofreq/change_responsible.html b/ietf/templates/doc/bofreq/change_responsible.html index ad9db1013..f9468dad3 100644 --- a/ietf/templates/doc/bofreq/change_responsible.html +++ b/ietf/templates/doc/bofreq/change_responsible.html @@ -21,7 +21,7 @@ - Back + Back diff --git a/ietf/templates/doc/change_ad.html b/ietf/templates/doc/change_ad.html index 747cd24a6..9fbab700d 100644 --- a/ietf/templates/doc/change_ad.html +++ b/ietf/templates/doc/change_ad.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html index e0aeeab98..3f5d8d637 100644 --- a/ietf/templates/doc/change_shepherd.html +++ b/ietf/templates/doc/change_shepherd.html @@ -24,7 +24,7 @@ - Back + Back diff --git a/ietf/templates/doc/change_shepherd_email.html b/ietf/templates/doc/change_shepherd_email.html index f9caf278f..d9ad9d527 100644 --- a/ietf/templates/doc/change_shepherd_email.html +++ b/ietf/templates/doc/change_shepherd_email.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html index 5c3272ba5..1773545fb 100644 --- a/ietf/templates/doc/change_state.html +++ b/ietf/templates/doc/change_state.html @@ -19,7 +19,7 @@ - Back + Back diff --git a/ietf/templates/doc/change_title.html b/ietf/templates/doc/change_title.html index 11484b6ae..e3f68a312 100644 --- a/ietf/templates/doc/change_title.html +++ b/ietf/templates/doc/change_title.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/charter/action_announcement_text.html b/ietf/templates/doc/charter/action_announcement_text.html index bf15fbfd3..e5944f51e 100644 --- a/ietf/templates/doc/charter/action_announcement_text.html +++ b/ietf/templates/doc/charter/action_announcement_text.html @@ -24,7 +24,7 @@ Charter approval page {% endif %} - Back + Back diff --git a/ietf/templates/doc/charter/approve.html b/ietf/templates/doc/charter/approve.html index 42506c52a..b7cf2d5bd 100644 --- a/ietf/templates/doc/charter/approve.html +++ b/ietf/templates/doc/charter/approve.html @@ -18,7 +18,7 @@ Edit/regenerate announcement - Back + Back diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html index ac092849e..f177759f1 100644 --- a/ietf/templates/doc/charter/ballot_writeupnotes.html +++ b/ietf/templates/doc/charter/ballot_writeupnotes.html @@ -23,7 +23,7 @@ - Back + Back diff --git a/ietf/templates/doc/charter/change_ad.html b/ietf/templates/doc/charter/change_ad.html index 8e6269233..46ec91b62 100644 --- a/ietf/templates/doc/charter/change_ad.html +++ b/ietf/templates/doc/charter/change_ad.html @@ -19,7 +19,7 @@ - Back + Back diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html index 437edd15d..39b3db8ad 100644 --- a/ietf/templates/doc/charter/change_state.html +++ b/ietf/templates/doc/charter/change_state.html @@ -40,7 +40,7 @@ {% endif %} {% if not option or option == "abandon" %} - Back + Back {% endif %} diff --git a/ietf/templates/doc/charter/change_title.html b/ietf/templates/doc/charter/change_title.html index 3398b3a06..7d5042fcb 100644 --- a/ietf/templates/doc/charter/change_title.html +++ b/ietf/templates/doc/charter/change_title.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/charter/review_announcement_text.html b/ietf/templates/doc/charter/review_announcement_text.html index 40f7fda01..8f6e17646 100644 --- a/ietf/templates/doc/charter/review_announcement_text.html +++ b/ietf/templates/doc/charter/review_announcement_text.html @@ -26,7 +26,7 @@ {% endif %} - Back + Back diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index e4d65bcfb..6f4fb879b 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -91,9 +91,9 @@ {% if group.charter %} - Back + Back {% else %} - Back + Back {% endif %} diff --git a/ietf/templates/doc/conflict_review/approve.html b/ietf/templates/doc/conflict_review/approve.html index c83e13b4f..5435a03a2 100644 --- a/ietf/templates/doc/conflict_review/approve.html +++ b/ietf/templates/doc/conflict_review/approve.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html index 74532e5fa..f58ad72c7 100644 --- a/ietf/templates/doc/conflict_review/start.html +++ b/ietf/templates/doc/conflict_review/start.html @@ -23,7 +23,7 @@ - Back + Back diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html index 9fa774e6a..3a1c31762 100644 --- a/ietf/templates/doc/conflict_review/submit.html +++ b/ietf/templates/doc/conflict_review/submit.html @@ -22,7 +22,7 @@ - Back + Back diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index 52b4e82a6..288f611e3 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -74,7 +74,7 @@ {% for p in positions %} {% if not p.is_old_pos %}

{{ p.balloter.plain_name }} - + {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} {{p.pos}} {% if user|has_role:"Secretariat" %} @@ -87,13 +87,13 @@
{{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) {% if p.send_email %} - + {% elif p.any_email_sent == True %} - + {% elif p.any_email_sent == False %} - + {% else %} - + {% endif %}
@@ -106,13 +106,13 @@
Comment ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) {% if p.send_email %} - + {% elif p.any_email_sent == True %} - + {% elif p.any_email_sent == False %} - + {% else %} -
No email
send info
+
No email
send info
{% endif %}
@@ -128,7 +128,7 @@ {% if p.is_old_pos %}

({{ p.balloter.plain_name }}; former steering group member) - + {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} {{p.pos}} {% if user|has_role:"Secretariat" %} @@ -145,13 +145,13 @@ ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) {% endif %} {% if p.send_email %} - + {% elif p.any_email_sent == True %} - + {% elif p.any_email_sent == False %} - + {% else %} -
No email
send info
+
No email
send info
{% endif %}

diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 007bb51c4..823098aa9 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -59,7 +59,7 @@ State {% if not snapshot and user|has_role:"Area Director,Secretariat" %} - Edit + Edit {% endif %} @@ -74,7 +74,7 @@ Shepherding AD {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} @@ -88,7 +88,7 @@ Telechat date {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} @@ -111,7 +111,7 @@ Send notices to {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 87bba7304..d1f6955d8 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -196,7 +196,7 @@ Formats - {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %}
Expired & archived
{% endif %} + {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %}
Expired & archived
{% endif %} {% if file_urls %} {% for label, url in file_urls %} diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index 97d3470db..8a33594a6 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -36,7 +36,7 @@ {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} @@ -70,7 +70,7 @@ State {% if not snapshot and user|has_role:"Area Director,Secretariat" %} - Edit + Edit {% endif %} @@ -85,7 +85,7 @@ Telechat date {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} @@ -107,7 +107,7 @@ Shepherding AD {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} @@ -120,7 +120,7 @@ Send notices to {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + Edit {% endif %} diff --git a/ietf/templates/doc/draft/add_iana_experts_comment.html b/ietf/templates/doc/draft/add_iana_experts_comment.html index a67f369fc..4c42fd960 100644 --- a/ietf/templates/doc/draft/add_iana_experts_comment.html +++ b/ietf/templates/doc/draft/add_iana_experts_comment.html @@ -18,7 +18,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/adopt_draft.html b/ietf/templates/doc/draft/adopt_draft.html index 68990c301..2e6062f98 100644 --- a/ietf/templates/doc/draft/adopt_draft.html +++ b/ietf/templates/doc/draft/adopt_draft.html @@ -22,7 +22,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html index 47db4f315..050641bbd 100644 --- a/ietf/templates/doc/draft/change_ad.html +++ b/ietf/templates/doc/draft/change_ad.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html index 60984c100..43f68b506 100644 --- a/ietf/templates/doc/draft/change_consensus.html +++ b/ietf/templates/doc/draft/change_consensus.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html index a37a74e04..f06ad0e3f 100644 --- a/ietf/templates/doc/draft/change_iana_state.html +++ b/ietf/templates/doc/draft/change_iana_state.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html index a4b0b0759..b832c6981 100644 --- a/ietf/templates/doc/draft/change_intended_status.html +++ b/ietf/templates/doc/draft/change_intended_status.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html index 8e0bd145b..dd71291a8 100644 --- a/ietf/templates/doc/draft/change_replaces.html +++ b/ietf/templates/doc/draft/change_replaces.html @@ -26,7 +26,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html index ee1be005d..65064f319 100644 --- a/ietf/templates/doc/draft/change_shepherd_writeup.html +++ b/ietf/templates/doc/draft/change_shepherd_writeup.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html index 7ebd8451b..2c006173c 100644 --- a/ietf/templates/doc/draft/change_state.html +++ b/ietf/templates/doc/draft/change_state.html @@ -29,7 +29,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_stream.html b/ietf/templates/doc/draft/change_stream.html index 8e6f2d539..ae61a00f1 100644 --- a/ietf/templates/doc/draft/change_stream.html +++ b/ietf/templates/doc/draft/change_stream.html @@ -16,7 +16,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html index 8d88cdbce..92995e651 100644 --- a/ietf/templates/doc/draft/change_stream_state.html +++ b/ietf/templates/doc/draft/change_stream_state.html @@ -19,7 +19,7 @@ {% for state in next_states %} {% endfor %} - Help on states + Help on states

{% endif %} @@ -29,7 +29,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html index 3f0736f8e..1044f7134 100644 --- a/ietf/templates/doc/draft/edit_iesg_note.html +++ b/ietf/templates/doc/draft/edit_iesg_note.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html index 37e30f889..99a0b6756 100644 --- a/ietf/templates/doc/draft/edit_info.html +++ b/ietf/templates/doc/draft/edit_info.html @@ -18,7 +18,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html index 5bc54f1ba..a990dee7a 100644 --- a/ietf/templates/doc/draft/make_last_call.html +++ b/ietf/templates/doc/draft/make_last_call.html @@ -23,7 +23,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/release_draft.html b/ietf/templates/doc/draft/release_draft.html index 490dc9192..978428859 100644 --- a/ietf/templates/doc/draft/release_draft.html +++ b/ietf/templates/doc/draft/release_draft.html @@ -23,7 +23,7 @@ {% csrf_token %} {% bootstrap_form form %} - Cancel + Cancel {% endblock %} diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html index 3c8c4e436..5a2d5ae80 100644 --- a/ietf/templates/doc/draft/request_publication.html +++ b/ietf/templates/doc/draft/request_publication.html @@ -55,7 +55,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/request_resurrect.html b/ietf/templates/doc/draft/request_resurrect.html index 6ef70ad64..7267088b5 100644 --- a/ietf/templates/doc/draft/request_resurrect.html +++ b/ietf/templates/doc/draft/request_resurrect.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html index 3f26d5396..83a1ac517 100644 --- a/ietf/templates/doc/draft/resurrect.html +++ b/ietf/templates/doc/draft/resurrect.html @@ -23,7 +23,7 @@ - Back + Back diff --git a/ietf/templates/doc/draft/review_possibly_replaces.html b/ietf/templates/doc/draft/review_possibly_replaces.html index b69e1fb3c..ad2412f6a 100644 --- a/ietf/templates/doc/draft/review_possibly_replaces.html +++ b/ietf/templates/doc/draft/review_possibly_replaces.html @@ -16,7 +16,7 @@ - Cancel + Cancel diff --git a/ietf/templates/doc/edit_action_holders.html b/ietf/templates/doc/edit_action_holders.html index 62ef2d776..b28a9ee13 100644 --- a/ietf/templates/doc/edit_action_holders.html +++ b/ietf/templates/doc/edit_action_holders.html @@ -43,7 +43,7 @@ - Back + Back diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html index b0e149235..27a53c152 100644 --- a/ietf/templates/doc/edit_authors.html +++ b/ietf/templates/doc/edit_authors.html @@ -61,7 +61,7 @@ - Back diff --git a/ietf/templates/doc/edit_field.html b/ietf/templates/doc/edit_field.html index 9c896963c..72ff38418 100644 --- a/ietf/templates/doc/edit_field.html +++ b/ietf/templates/doc/edit_field.html @@ -27,7 +27,7 @@ - Back + Back diff --git a/ietf/templates/doc/edit_notify.html b/ietf/templates/doc/edit_notify.html index da3535ee0..65faa0182 100644 --- a/ietf/templates/doc/edit_notify.html +++ b/ietf/templates/doc/edit_notify.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html index 404cd097a..019fa0fbd 100644 --- a/ietf/templates/doc/edit_telechat_date.html +++ b/ietf/templates/doc/edit_telechat_date.html @@ -25,7 +25,7 @@ - Back + Back diff --git a/ietf/templates/doc/material/edit_material.html b/ietf/templates/doc/material/edit_material.html index d9390ba00..f03cedb1b 100644 --- a/ietf/templates/doc/material/edit_material.html +++ b/ietf/templates/doc/material/edit_material.html @@ -64,7 +64,7 @@ - Back + Back diff --git a/ietf/templates/doc/remind_action_holders.html b/ietf/templates/doc/remind_action_holders.html index 28473805c..daeab50b7 100644 --- a/ietf/templates/doc/remind_action_holders.html +++ b/ietf/templates/doc/remind_action_holders.html @@ -23,7 +23,7 @@ - Cancel + Cancel diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html index ac99cad0c..f62557275 100644 --- a/ietf/templates/doc/review/complete_review.html +++ b/ietf/templates/doc/review/complete_review.html @@ -98,8 +98,8 @@ {% spaceless %} diff --git a/ietf/templates/doc/review/request_review.html b/ietf/templates/doc/review/request_review.html index 67022539c..68e444e3c 100644 --- a/ietf/templates/doc/review/request_review.html +++ b/ietf/templates/doc/review/request_review.html @@ -39,7 +39,7 @@ - Back + Back diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html index bca0064ad..54974b470 100644 --- a/ietf/templates/doc/search/search_result_row.html +++ b/ietf/templates/doc/search/search_result_row.html @@ -50,9 +50,9 @@
{{ doc.title }} {% if doc.has_verified_errata %} - Errata + Errata {% elif doc.has_errata %} - Errata + Errata {% endif %} @@ -88,9 +88,9 @@ {% for check in doc.submission.latest_checks %} {% if check.passed != None and check.symbol.strip %} {% if check.errors or check.warnings %} - {{ check.symbol|safe }} + {{ check.symbol|safe }} {% else %} - {{ check.symbol|safe }} + {{ check.symbol|safe }} {% endif %} {% include "doc/yang-check-modal-overlay.html" %} {% endif %} @@ -102,7 +102,7 @@ {% endif %} {% if doc.latest_revision_date|timesince_days|new_enough:request %} -
New
+
New
{% endif %} {% if doc.get_state_slug == "active" and doc.expirable and doc.expires|timesince_days|expires_soon:request %} diff --git a/ietf/templates/doc/search/status_columns.html b/ietf/templates/doc/search/status_columns.html index d233e4611..36982706d 100644 --- a/ietf/templates/doc/search/status_columns.html +++ b/ietf/templates/doc/search/status_columns.html @@ -2,7 +2,7 @@ {% load ietf_filters ballot_icon person_filters %} -
+
{% if doc.ballot %}{% ballot_icon doc %}{% endif %}
diff --git a/ietf/templates/doc/shepherd_writeup.html b/ietf/templates/doc/shepherd_writeup.html index 4c0c77162..e9caa9c64 100644 --- a/ietf/templates/doc/shepherd_writeup.html +++ b/ietf/templates/doc/shepherd_writeup.html @@ -17,6 +17,6 @@ {% if can_edit %} Edit {% endif %} - Back + Back {% endblock %} diff --git a/ietf/templates/doc/status_change/approve.html b/ietf/templates/doc/status_change/approve.html index 251ff7bb6..c020f8676 100644 --- a/ietf/templates/doc/status_change/approve.html +++ b/ietf/templates/doc/status_change/approve.html @@ -17,7 +17,7 @@ - Back + Back diff --git a/ietf/templates/doc/status_change/edit_relations.html b/ietf/templates/doc/status_change/edit_relations.html index fac9a3a96..2ce0da5b6 100644 --- a/ietf/templates/doc/status_change/edit_relations.html +++ b/ietf/templates/doc/status_change/edit_relations.html @@ -23,7 +23,7 @@ - Back + Back diff --git a/ietf/templates/doc/status_change/last_call.html b/ietf/templates/doc/status_change/last_call.html index cd9ce8ece..7e85b8eda 100644 --- a/ietf/templates/doc/status_change/last_call.html +++ b/ietf/templates/doc/status_change/last_call.html @@ -23,7 +23,7 @@ {% if user|has_role:"Secretariat" %} Issue last call {% endif %} - Back + Back diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html index bed78ab8d..c78e8ea23 100644 --- a/ietf/templates/doc/status_change/make_last_call.html +++ b/ietf/templates/doc/status_change/make_last_call.html @@ -28,7 +28,7 @@ - Back + Back diff --git a/ietf/templates/doc/status_change/start.html b/ietf/templates/doc/status_change/start.html index 45e7628a6..763f9b694 100644 --- a/ietf/templates/doc/status_change/start.html +++ b/ietf/templates/doc/status_change/start.html @@ -27,7 +27,7 @@ - Back + Back
diff --git a/ietf/templates/doc/status_change/submit.html b/ietf/templates/doc/status_change/submit.html index 8614fd2a7..fff7c7f92 100644 --- a/ietf/templates/doc/status_change/submit.html +++ b/ietf/templates/doc/status_change/submit.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html index ea4df24ba..906e64ddf 100644 --- a/ietf/templates/doc/submit_to_iesg.html +++ b/ietf/templates/doc/submit_to_iesg.html @@ -75,7 +75,7 @@ - + diff --git a/ietf/templates/group/add_comment.html b/ietf/templates/group/add_comment.html index 702ac66f2..5e6eb1207 100644 --- a/ietf/templates/group/add_comment.html +++ b/ietf/templates/group/add_comment.html @@ -18,7 +18,7 @@ - Back + Back diff --git a/ietf/templates/group/change_review_secretary_settings.html b/ietf/templates/group/change_review_secretary_settings.html index f47c7f389..7d0149e6b 100644 --- a/ietf/templates/group/change_review_secretary_settings.html +++ b/ietf/templates/group/change_review_secretary_settings.html @@ -14,7 +14,7 @@ - Cancel + Cancel diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html index e72fc4986..018defb4b 100644 --- a/ietf/templates/group/change_reviewer_settings.html +++ b/ietf/templates/group/change_reviewer_settings.html @@ -22,7 +22,7 @@ - Cancel + Cancel diff --git a/ietf/templates/group/chartering_groups.html b/ietf/templates/group/chartering_groups.html index 6d8a33fcc..b08c4b9d8 100644 --- a/ietf/templates/group/chartering_groups.html +++ b/ietf/templates/group/chartering_groups.html @@ -57,7 +57,7 @@ {{ g.charter.time|date:"Y-m-d" }} -
{% ballot_icon g.charter %}
+
{% ballot_icon g.charter %}
{{ g.charter.get_state.name }} {% if g.chartering_type == "initial" %}(Initial Chartering){% endif %} diff --git a/ietf/templates/group/conclude.html b/ietf/templates/group/conclude.html index 5f6d960dc..ecb8cfbbc 100644 --- a/ietf/templates/group/conclude.html +++ b/ietf/templates/group/conclude.html @@ -25,7 +25,7 @@ - Back + Back diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html index 09b8d688b..291e253cf 100644 --- a/ietf/templates/group/edit.html +++ b/ietf/templates/group/edit.html @@ -43,7 +43,7 @@ {% if action == "edit" %} - Back + Back {% elif action == "charter" %} {% else %} diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html index 52579acd9..751803df9 100644 --- a/ietf/templates/group/edit_milestones.html +++ b/ietf/templates/group/edit_milestones.html @@ -105,7 +105,7 @@ - Cancel + Cancel diff --git a/ietf/templates/group/email_open_review_assignments.html b/ietf/templates/group/email_open_review_assignments.html index c0e9709fc..980fedfcd 100644 --- a/ietf/templates/group/email_open_review_assignments.html +++ b/ietf/templates/group/email_open_review_assignments.html @@ -17,7 +17,7 @@ - Cancel + Cancel diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html index aef03e16a..be2bc8a59 100644 --- a/ietf/templates/group/group_about_status.html +++ b/ietf/templates/group/group_about_status.html @@ -21,7 +21,7 @@ {% if can_provide_status_update %} Edit {% endif %} - Back + Back {% if can_provide_status_update %}

About Status Updates

diff --git a/ietf/templates/group/group_about_status_edit.html b/ietf/templates/group/group_about_status_edit.html index 83a5c1612..70d2f0ffd 100644 --- a/ietf/templates/group/group_about_status_edit.html +++ b/ietf/templates/group/group_about_status_edit.html @@ -21,7 +21,7 @@ - Back + Back diff --git a/ietf/templates/group/group_about_status_meeting.html b/ietf/templates/group/group_about_status_meeting.html index 6ca11cb8a..197e2a038 100644 --- a/ietf/templates/group/group_about_status_meeting.html +++ b/ietf/templates/group/group_about_status_meeting.html @@ -18,6 +18,6 @@
{{ status_update.desc|default:"(none)"|linkify }}
- Back + Back {% endblock %} diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html index 61f1d4d48..2c51b11e7 100644 --- a/ietf/templates/group/manage_review_requests.html +++ b/ietf/templates/group/manage_review_requests.html @@ -36,7 +36,7 @@

- + {% if r.in_lc_and_telechat %}Last Call and telechat{% else %}{{ r.type.name }}{% endif %} - deadline {{ r.deadline|date:"Y-m-d" }} {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} @@ -176,7 +176,7 @@ - Cancel + Cancel diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html index 7da15db79..b27f4c1d6 100644 --- a/ietf/templates/group/meetings.html +++ b/ietf/templates/group/meetings.html @@ -34,7 +34,7 @@
Future Meetings - +
{% with sessions=future show_request=True show_ical=True can_edit_materials=can_edit %} diff --git a/ietf/templates/group/reset_charter_milestones.html b/ietf/templates/group/reset_charter_milestones.html index 2a72842c0..680fb86ad 100644 --- a/ietf/templates/group/reset_charter_milestones.html +++ b/ietf/templates/group/reset_charter_milestones.html @@ -33,7 +33,7 @@ - Back + Back diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html index 4ebe80ddb..ba563ad42 100644 --- a/ietf/templates/group/review_requests.html +++ b/ietf/templates/group/review_requests.html @@ -14,7 +14,7 @@ {% origin %} {% if can_access_stats %} -

  

+

  

{% endif %} {% if unassigned_review_requests %} diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html index f02789c7e..af793da6e 100644 --- a/ietf/templates/group/reviewer_overview.html +++ b/ietf/templates/group/reviewer_overview.html @@ -14,7 +14,7 @@ {% endblock %} {% if can_access_stats %} -

  

+

  

{% endif %}

Reviewers

diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html index 4a0ab7068..cb68f7169 100644 --- a/ietf/templates/group/stream_edit.html +++ b/ietf/templates/group/stream_edit.html @@ -36,7 +36,7 @@ - Back + Back diff --git a/ietf/templates/iesg/agenda_charter.html b/ietf/templates/iesg/agenda_charter.html index 2a34e8c50..a7f0b9446 100644 --- a/ietf/templates/iesg/agenda_charter.html +++ b/ietf/templates/iesg/agenda_charter.html @@ -2,7 +2,7 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %}{% origin %} -
{% ballot_icon doc %}
+
{% ballot_icon doc %}
{{ doc.group.type }} name
diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index 6aed21761..cb398fa77 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -1,7 +1,7 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} {% load ietf_filters ballot_icon %} -
{% ballot_icon doc %}
+
{% ballot_icon doc %}
{% with doc.conflictdoc as conflictdoc %} diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html index 8970b626d..87e20a84b 100644 --- a/ietf/templates/iesg/agenda_doc.html +++ b/ietf/templates/iesg/agenda_doc.html @@ -1,7 +1,7 @@ {# Copyright The IETF Trust 2016, All Rights Reserved #}{% load origin %}{% origin %} {% load ietf_filters ballot_icon %} -
{% ballot_icon doc %}
+
{% ballot_icon doc %}
diff --git a/ietf/templates/ietfauth/edit_field.html b/ietf/templates/ietfauth/edit_field.html index 35eb7c569..6674791b8 100644 --- a/ietf/templates/ietfauth/edit_field.html +++ b/ietf/templates/ietfauth/edit_field.html @@ -27,7 +27,7 @@ - Back + Back diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html index bb9a09959..eefca14e3 100644 --- a/ietf/templates/ipr/add_comment.html +++ b/ietf/templates/ipr/add_comment.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/ipr/add_email.html b/ietf/templates/ipr/add_email.html index 8b1f56d83..cdd77b4ff 100644 --- a/ietf/templates/ipr/add_email.html +++ b/ietf/templates/ipr/add_email.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html index 460fe8d80..293f04b42 100644 --- a/ietf/templates/ipr/email.html +++ b/ietf/templates/ipr/email.html @@ -22,7 +22,7 @@ - Back + Back diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html index cd554f851..1867d6fe4 100644 --- a/ietf/templates/ipr/search_form.html +++ b/ietf/templates/ipr/search_form.html @@ -112,5 +112,5 @@
- Back + Back diff --git a/ietf/templates/ipr/state.html b/ietf/templates/ipr/state.html index 71921163c..4de3ccb4b 100644 --- a/ietf/templates/ipr/state.html +++ b/ietf/templates/ipr/state.html @@ -18,7 +18,7 @@ - Back + Back diff --git a/ietf/templates/liaisons/add_comment.html b/ietf/templates/liaisons/add_comment.html index 876bd3ea1..7f4a93dd1 100644 --- a/ietf/templates/liaisons/add_comment.html +++ b/ietf/templates/liaisons/add_comment.html @@ -20,7 +20,7 @@ - Back + Back diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html index 4ce2b3a07..94753f492 100644 --- a/ietf/templates/liaisons/detail.html +++ b/ietf/templates/liaisons/detail.html @@ -94,7 +94,7 @@ Action Needed {% endif %} {% if can_take_care %} -
+ {% csrf_token %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html index 0e8f29713..33618d984 100644 --- a/ietf/templates/liaisons/edit.html +++ b/ietf/templates/liaisons/edit.html @@ -56,7 +56,7 @@ - Cancel + Cancel {% if not liaison %} diff --git a/ietf/templates/liaisons/edit_attachment.html b/ietf/templates/liaisons/edit_attachment.html index 07bc09c1e..20d40b0fe 100644 --- a/ietf/templates/liaisons/edit_attachment.html +++ b/ietf/templates/liaisons/edit_attachment.html @@ -32,7 +32,7 @@ {% bootstrap_form form %} - Cancel + Cancel diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 46e23ed0c..44aceae9c 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -195,7 +195,7 @@ {% if item.timeslot.location.floorplan %}

    diff --git a/ietf/templates/submit/add_preapproval.html b/ietf/templates/submit/add_preapproval.html index feb72322b..64fca757c 100644 --- a/ietf/templates/submit/add_preapproval.html +++ b/ietf/templates/submit/add_preapproval.html @@ -47,7 +47,7 @@ - Back + Back diff --git a/ietf/templates/submit/add_submit_email.html b/ietf/templates/submit/add_submit_email.html index 050272412..020c97bb5 100644 --- a/ietf/templates/submit/add_submit_email.html +++ b/ietf/templates/submit/add_submit_email.html @@ -31,7 +31,7 @@ - Back + Back diff --git a/ietf/templates/submit/cancel_preapproval.html b/ietf/templates/submit/cancel_preapproval.html index e39de0bdc..fad525eab 100644 --- a/ietf/templates/submit/cancel_preapproval.html +++ b/ietf/templates/submit/cancel_preapproval.html @@ -22,7 +22,7 @@ - Back + Back diff --git a/ietf/templates/submit/edit_submission.html b/ietf/templates/submit/edit_submission.html index 4518549df..e549e99a8 100644 --- a/ietf/templates/submit/edit_submission.html +++ b/ietf/templates/submit/edit_submission.html @@ -40,7 +40,7 @@ Document {{ submission.name }} - + {% show_submission_files submission %} diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html index 7aaadf64d..7a6f230c4 100644 --- a/ietf/templates/submit/submission_status.html +++ b/ietf/templates/submit/submission_status.html @@ -146,7 +146,7 @@ {{ submission.name }} {% endif %} - + {% show_submission_files submission %} @@ -162,7 +162,7 @@ {{ submission.rev }} {% if errors.rev %} - +

    {{ errors.rev }}

    {% endif %}