From 6ca6c35186bf42abf6b971691492f6d4be3428d1 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Tue, 11 Jan 2022 15:02:27 +0000 Subject: [PATCH] More fixes. - Legacy-Id: 19829 --- ietf/doc/tests.py | 8 +- ietf/group/tests_info.py | 4 +- ietf/static/css/ietf.scss | 15 +- ietf/static/js/complete-review.js | 8 +- ...dit-meeting-timeslots-and-misc-sessions.js | 10 +- ietf/static/js/ietf.js | 5 +- ietf/static/js/ipr-search.js | 2 +- ietf/static/js/liaisons.js | 8 +- ietf/static/js/list.js | 4 +- ietf/static/js/upload-material.js | 2 +- ietf/templates/debug.html | 2 +- ietf/templates/doc/ballot/approve_ballot.html | 2 +- ietf/templates/doc/ballot/edit_position.html | 8 +- ietf/templates/doc/document_bofreq.html | 2 +- ietf/templates/doc/document_charter.html | 16 +- .../doc/document_conflict_review.html | 18 +- ietf/templates/doc/document_draft.html | 185 ++++++++---- ietf/templates/doc/document_material.html | 100 +++---- .../templates/doc/document_referenced_by.html | 61 ++-- ietf/templates/doc/document_references.html | 62 ++-- ietf/templates/doc/document_review.html | 37 +-- .../templates/doc/document_status_change.html | 131 +++++---- ietf/templates/doc/document_writeup.html | 27 +- ietf/templates/doc/downref.html | 18 +- ietf/templates/doc/downref_add.html | 39 +-- .../doc/draft/add_iana_experts_comment.html | 28 +- ietf/templates/doc/draft/adopt_draft.html | 33 +-- ietf/templates/doc/draft/change_ad.html | 22 +- .../templates/doc/draft/change_consensus.html | 24 +- .../doc/draft/change_iana_state.html | 20 +- .../doc/draft/change_intended_status.html | 18 +- .../doc/draft/change_shepherd_writeup.html | 40 +-- ietf/templates/doc/draft/change_state.html | 71 +++-- .../doc/draft/change_stream_state.html | 33 +-- ietf/templates/doc/draft/edit_iesg_note.html | 21 +- ietf/templates/doc/draft/edit_info.html | 20 +- .../doc/draft/last_call_requested.html | 18 +- ietf/templates/doc/draft/make_last_call.html | 22 +- ietf/templates/doc/draft/release_draft.html | 40 +-- .../doc/draft/request_publication.html | 65 ++-- .../doc/draft/request_resurrect.html | 29 +- ietf/templates/doc/draft/resurrect.html | 30 +- .../doc/draft/review_possibly_replaces.html | 13 +- .../draft/rfceditor_note_duplicate_error.html | 23 +- .../rfceditor_post_approved_draft_failed.html | 33 ++- ietf/templates/doc/drafts_for_ad.html | 42 +-- .../templates/doc/drafts_in_iesg_process.html | 54 ++-- ietf/templates/doc/drafts_in_last_call.html | 13 +- ietf/templates/doc/edit_authors.html | 75 ++--- .../templates/doc/review/complete_review.html | 2 +- ietf/templates/doc/review/request_info.html | 277 ++++++++++++------ .../doc/status_change/make_last_call.html | 2 +- ietf/templates/group/edit.html | 2 +- ietf/templates/ietfauth/apikeys.html | 2 +- ietf/templates/ipr/details_edit.html | 6 +- ietf/templates/ipr/search_form.html | 16 +- ietf/templates/meeting/interim_request.html | 26 +- .../meeting/interim_request_cancel.html | 2 +- .../meeting/interim_request_edit.html | 18 +- .../meeting/interim_send_announcement.html | 10 +- ietf/templates/nomcom/feedback.html | 4 +- ietf/templates/nomcom/private_index.html | 6 +- ietf/templates/person/merge.html | 2 +- ietf/templates/person/person_link.html | 29 +- ietf/templates/submit/search_submission.html | 2 +- package-lock.json | 125 ++++---- 66 files changed, 1108 insertions(+), 984 deletions(-) diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index d6b84421a..784518aab 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -278,7 +278,7 @@ class SearchTests(TestCase): r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_last_call')) self.assertEqual(r.status_code, 200) self.assertContains(r, draft.title) - self.assertContains(r, escape(draft.action_holders.first().plain_name())) + self.assertContains(r, escape(draft.action_holders.first().name)) def test_in_iesg_process(self): doc_in_process = IndividualDraftFactory() @@ -350,7 +350,7 @@ class SearchTests(TestCase): self.assertEqual(q('td.status span.badge.bg-warning').text(),"for 15 days") self.assertEqual(q('td.status span.badge.bg-danger').text(),"for 29 days") for ah in [draft.action_holders.first() for draft in drafts]: - self.assertContains(r, escape(ah.plain_name())) + self.assertContains(r, escape(ah.name)) class DocDraftTestCase(TestCase): draft_text = """ @@ -1278,7 +1278,7 @@ Man Expires September 22, 2015 [Page 3] q = PyQuery(r.content) self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 0) for person in draft.action_holders.all(): - self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.plain_name())), 1) + self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.name)), 1) # check that one action holder was marked as old self.assertEqual(len(self._pyquery_select_action_holder_string(q, 'for 30 days')), 1) @@ -2431,7 +2431,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertTrue(q('#materials-content > pre')) + self.assertTrue(q('#materials-content pre')) url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=self.doc.name,rev='01')) r = self.client.get(url) diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py index e79e94a8d..88bb7e9f1 100644 --- a/ietf/group/tests_info.py +++ b/ietf/group/tests_info.py @@ -65,7 +65,7 @@ class GroupPagesTests(TestCase): self.assertContains(r, group.parent.name) self.assertContains(r, group.acronym) self.assertContains(r, group.name) - self.assertContains(r, escape(group.ad_role().person.plain_name())) + self.assertContains(r, escape(group.ad_role().person.name)) for t in ('rg','area','ag', 'rag', 'dir','review','team','program','iabasg','adm'): g = GroupFactory.create(type_id=t,state_id='active') @@ -348,7 +348,7 @@ class GroupPagesTests(TestCase): self.assertEqual(r.status_code, 200) for role in group.role_set.all(): - self.assertContains(r, escape(role.person.plain_name())) + self.assertContains(r, escape(role.person.name)) def test_materials(self): group = GroupFactory(type_id="team", acronym="testteam", name="Test Team", state_id="active") diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss index ad22b6758..a881a34de 100644 --- a/ietf/static/css/ietf.scss +++ b/ietf/static/css/ietf.scss @@ -170,14 +170,6 @@ $timeline-even-hover-color: shift-color($timeline-even-color, $link-shade-percen border: 2 * $table-border-width solid #000; } -.is-blocking { - box-shadow: 0 0 8px 8px #dc0d12; - padding: 3px 0px 3px 3px; - margin: 5px 1px 3px 0px; - border: 1px solid #dc0d12; -} - - // See https://getbootstrap.com/docs/5.0/customize/color/#all-colors $color-discuss: $red-500; $color-yes: $green-500; @@ -186,6 +178,11 @@ $color-abstain: $orange-400; $color-recuse: $purple-400; $color-norecord: $gray-300; +.is-blocking { + box-shadow: 0 0 map.get($spacers, 2) map.get($spacers, 2) $color-discuss; + margin: map.get($spacers, 2); +} + .color-discuss { color: $color-discuss; } @@ -805,7 +802,7 @@ td.position-empty { align-items: baseline; } -.edit-meeting-timeslots-and-misc-sessions .scheduling-panel .flowing-form .form-group { +.edit-meeting-timeslots-and-misc-sessions .scheduling-panel .flowing-form .mb-3 { margin-right: 1em; margin-bottom: 0.5em; } diff --git a/ietf/static/js/complete-review.js b/ietf/static/js/complete-review.js index 9f373a2e1..e26f20267 100644 --- a/ietf/static/js/complete-review.js +++ b/ietf/static/js/complete-review.js @@ -2,7 +2,7 @@ $(document).ready(function () { var form = $("form.complete-review"); var reviewedRev = form.find("[name=reviewed_rev]"); - reviewedRev.closest(".form-group").find("a.rev").on("click", function (e) { + reviewedRev.closest(".mb-3").find("a.rev").on("click", function (e) { e.preventDefault(); reviewedRev.val($(this).text()); }); @@ -11,7 +11,7 @@ $(document).ready(function () { var mailArchiveSearchTemplate = form.find(".template .mail-archive-search").parent().html(); var mailArchiveSearchResultTemplate = form.find(".template .mail-archive-search-result").parent().html(); - form.find("[name=review_url]").closest(".form-group").before(mailArchiveSearchTemplate); + form.find("[name=review_url]").closest(".mb-3").before(mailArchiveSearchTemplate); var mailArchiveSearch = form.find(".mail-archive-search"); @@ -130,8 +130,8 @@ $(document).ready(function () { for (var i in shouldBeVisible[v]) { var selector = shouldBeVisible[v][i]; var row = form.find(selector); - if (!row.is(".form-group")) - row = row.closest(".form-group"); + if (!row.is(".mb-3")) + row = row.closest(".mb-3"); if ($.inArray(selector, shouldBeVisible[val]) != -1) row.show(); diff --git a/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js b/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js index b247e9e29..108bc0ddc 100644 --- a/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js +++ b/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js @@ -112,26 +112,26 @@ jQuery(document).ready(function () { let hide = {}; - form.find("[name=group],[name=short],[name=\"agenda_note\"]").prop('disabled', false).closest(".form-group").show(); + form.find("[name=group],[name=short],[name=\"agenda_note\"]").prop('disabled', false).closest(".mb-3").show(); if (this.value == "break") { - form.find("[name=short]").closest(".form-group").hide(); + form.find("[name=short]").closest(".mb-3").hide(); } else if (this.value == "plenary") { let group = form.find("[name=group]"); group.val(group.data('ietf')); } else if (this.value == "regular") { - form.find("[name=short]").closest(".form-group").hide(); + form.find("[name=short]").closest(".mb-3").hide(); } if (this.value != "regular") - form.find("[name=\"agenda_note\"]").closest(".form-group").hide(); + form.find("[name=\"agenda_note\"]").closest(".mb-3").hide(); if (['break', 'reg', 'reserved', 'unavail', 'regular'].indexOf(this.value) != -1) { let group = form.find("[name=group]"); group.prop('disabled', true); - group.closest(".form-group").hide(); + group.closest(".mb-3").hide(); } }); diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js index cd0d7259a..7a3b8d28b 100644 --- a/ietf/static/js/ietf.js +++ b/ietf/static/js/ietf.js @@ -137,9 +137,10 @@ $(document) var text = $(this) .html() .split("<") - .shift(); + .shift() + .trim(); - if (text === "") { + if (text === undefined || text === "") { // Nothing to do for empty headings. return; } diff --git a/ietf/static/js/ipr-search.js b/ietf/static/js/ipr-search.js index d2384061e..6b803e50f 100644 --- a/ietf/static/js/ipr-search.js +++ b/ietf/static/js/ipr-search.js @@ -16,7 +16,7 @@ $(document).ready(function() { // make enter presses submit through the nearby button $("form.ipr-search input,select").keyup(function (e) { - var submitButton = $(this).closest(".form-group").find('button[type=submit]'); + var submitButton = $(this).closest(".mb-3").find('button[type=submit]'); if (e.which == 13 && submitButton.length > 0) { submitButton.click(); return false; diff --git a/ietf/static/js/liaisons.js b/ietf/static/js/liaisons.js index 436264304..d0d541801 100644 --- a/ietf/static/js/liaisons.js +++ b/ietf/static/js/liaisons.js @@ -4,7 +4,7 @@ var attachmentWidget = { count: 0, readConfig: function () { - var buttonFormGroup = attachmentWidget.button.parents('.form-group'); + var buttonFormGroup = attachmentWidget.button.parents('.mb-3'); var disabledLabel = buttonFormGroup.find('.attachDisabledLabel'); if (disabledLabel.length) { @@ -57,7 +57,7 @@ var attachmentWidget = { attachmentWidget.config.fields.each(function () { var field = $(this); var container = $(this) - .parents('.form-group'); + .parents('.mb-3'); if (container.find(':file') .length) { html += ' (' + field.val() + ')'; @@ -109,7 +109,7 @@ var attachmentWidget = { attachmentWidget.config.basefields.each(function () { var field = $(this); var oldcontainer = $(this) - .parents('.form-group'); + .parents('.mb-3'); var newcontainer = oldcontainer.clone(); var newfield = newcontainer.find('#' + field.attr('id')); newfield.attr('name', newfield.attr('name') + '_' + attachmentWidget.count); @@ -248,7 +248,7 @@ var liaisonForm = { }, updatePurpose: function () { - var deadlinecontainer = liaisonForm.deadline.closest('.form-group'); + var deadlinecontainer = liaisonForm.deadline.closest('.mb-3'); var value = liaisonForm.purpose.val(); if (value == 'action' || value == 'comment') { diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js index 687f5628e..ceb477452 100644 --- a/ietf/static/js/list.js +++ b/ietf/static/js/list.js @@ -66,7 +66,9 @@ $(document) .wrap(`
field_magic(i, e, fields)); if ($(header_row) diff --git a/ietf/static/js/upload-material.js b/ietf/static/js/upload-material.js index c68b9c770..fb9f50587 100644 --- a/ietf/static/js/upload-material.js +++ b/ietf/static/js/upload-material.js @@ -4,7 +4,7 @@ 'use strict'; /** - * Hide the inactive input form-group + * Hide the inactive input mb-3 * @param form form to process */ function showUrlOrFile(form) { diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html index 4df9fa8fc..91a761821 100644 --- a/ietf/templates/debug.html +++ b/ietf/templates/debug.html @@ -110,7 +110,7 @@
{% else %} - Add ietf.context_processors.sql_debug to settings.DEV_TEMPLATE_CONTEXT_PROCESSORS to turn on the SQL statement table. + Add ietf.context_processors.sql_debug to settings.DEV_TEMPLATE_CONTEXT_PROCESSORS to turn on the SQL statement table. {% endif %} {% endif %} diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html index 9d5205f90..4040bfa4e 100644 --- a/ietf/templates/doc/ballot/approve_ballot.html +++ b/ietf/templates/doc/ballot/approve_ballot.html @@ -13,7 +13,7 @@
{% csrf_token %} - 
{{ announcement }}
+ 
{{ announcement }}
{% if action == "to_announcement_list" %} {% elif action == "to_rfc_editor" %} diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html index bee7877d5..4af073669 100644 --- a/ietf/templates/doc/ballot/edit_position.html +++ b/ietf/templates/doc/ballot/edit_position.html @@ -11,9 +11,11 @@
{{ doc }} -
- {{ ballot.ballot_type.question }} -
+ {% if ballot.ballot_type.question %} +
+ {{ ballot.ballot_type.question }} +
+ {% endif %} {% if ballot_deferred %}

Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}. diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html index 225173930..90ef1c0d4 100644 --- a/ietf/templates/doc/document_bofreq.html +++ b/ietf/templates/doc/document_bofreq.html @@ -153,7 +153,7 @@

{% endif %} {% endif %} -
+
{{ doc.name }}-{{ doc.rev }}
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html index a021d5cb1..659942ecb 100644 --- a/ietf/templates/doc/document_charter.html +++ b/ietf/templates/doc/document_charter.html @@ -213,11 +213,6 @@ {% endif %} {% endif %}

-

- Charter -
- {{ doc.canonical_name }}-{{ doc.rev }} -

{% if not snapshot and can_manage and chartering and group.state_id != "conclude" %}

{% endif %} {% if doc.rev != "" %} - {# this content is already wrapped in 'pre' #} - {{ content|sanitize|maybewordwrap|safe }} +

+
+ {{ doc.canonical_name }}-{{ doc.rev }} +
+
+ {# this content is already wrapped in 'pre' #} + {{ content|sanitize|maybewordwrap|safe }} +
+
{% endif %} {% if not snapshot and chartering %}

diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index c5e62e484..c9746d94c 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -15,7 +15,7 @@ {% if doc.rev != latest_rev %}
The information below is for an old version of the document
{% endif %} - +
@@ -117,11 +117,6 @@
Document
-

- Conflict review -
- {{ conflictdoc.name }}-{{ conflictdoc.rev }} -

{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %} @@ -138,7 +133,16 @@ {% endif %} {% endif %} {% endif %} - {% if doc.rev %}
   {{ content|sanitize|maybewordwrap|safe }}
{% endif %} + {% if doc.rev %} +
+
+ {{ doc.name }}-{{ doc.rev }} +
+
+ 
   {{ content|sanitize|maybewordwrap|safe }}
+
+
+ {% endif %} {% endblock %} {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html index b1a30a63e..3851770a0 100644 --- a/ietf/templates/doc/document_referenced_by.html +++ b/ietf/templates/doc/document_referenced_by.html @@ -1,34 +1,32 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin static ietf_filters %} - {% block pagehead %} {% endblock %} - -{% block title %} - References to {{alias_name}} -{% endblock %} - +{% block title %}References to {{ alias_name }}{% endblock %} {% block content %} {% origin %} -

References to {{alias_name}}

- -

+

References to {{ alias_name }}

+

These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.

-

- Showing RFCs and active Internet-Drafts, sorted by reference type, then document name. + Showing RFCs and active Internet-Drafts, sorted by + reference type + , then document name.

- {% if numdocs %}
-

Showing only the first 250 of {{ numdocs }} documents.

-

Show all

+

+ Showing only the first 250 of {{ numdocs }} documents. +

+

+ Show all +

{% endif %} - @@ -46,30 +44,45 @@ - - + + {% endwith %} {% endfor %}
{{ name|prettystdname }} {% if ref.target.name != alias_name %} -
As {{ref.target.name}} +
+ As {{ ref.target.name }} {% endif %} 		- {{ref.source.title}}
- References - Referenced by + {{ ref.source.title }} +
+ + + References + + + + Referenced by + 		{% ifequal ref.source.get_state.slug 'rfc' %} - {% with ref.source.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% with ref.source.std_level as lvl %} + {% if lvl %}{{ lvl }}{% endif %} + {% endwith %} {% else %} - {% with ref.source.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% with ref.source.intended_std_level as lvl %} + {% if lvl %}{{ lvl }}{% endif %} + {% endwith %} {% endifequal %} {{ref.relationship.name}}{{ref.is_downref|default:''}}{{ ref.relationship.name }}{{ ref.is_downref|default:'' }}
{% endblock %} - {% block js %} {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html index ff018cf6d..56d135195 100644 --- a/ietf/templates/doc/document_references.html +++ b/ietf/templates/doc/document_references.html @@ -1,26 +1,23 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin static ietf_filters %} - {% block pagehead %} {% endblock %} - -{% block title %} - References from {{doc.canonical_name}} -{% endblock %} - +{% block title %}References from {{ doc.canonical_name }}{% endblock %} {% block content %} {% origin %} -

References from {{doc.canonical_name}}

- -

+

References from {{ doc.canonical_name }}

+

These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.

- Reference type help + + Reference type help +

- @@ -35,28 +32,43 @@ {% for ref in refs %} {% with ref.target.name as name %} - + - - + + {% endwith %} {% endfor %}
{{ name|prettystdname }} - {{ref.target.document.title}}
- References - Referenced by + {{ name|prettystdname }} + 		+ {{ ref.target.document.title }} +
+ + + References + + + + Referenced by + 		{% ifequal ref.target.document.get_state.slug 'rfc' %} - {% with ref.target.document.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% with ref.target.document.std_level as lvl %} + {% if lvl %}{{ lvl }}{% endif %} + {% endwith %} {% else %} - {% with ref.target.document.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% with ref.target.document.intended_std_level as lvl %} + {% if lvl %}{{ lvl }}{% endif %} + {% endwith %} {% endifequal %} {{ref.relationship.name}}{{ref.is_downref|default:''}}{{ ref.relationship.name }}{{ ref.is_downref|default:'' }}
- -{% endblock %} - -{% block js %} - -{% endblock %} \ No newline at end of file + {% endblock %} + {% block js %} + + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html index 83b632b25..781fa336b 100644 --- a/ietf/templates/doc/document_review.html +++ b/ietf/templates/doc/document_review.html @@ -1,33 +1,21 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2016-2019, All Rights Reserved #} {% load origin %} {% load static %} {% load ietf_filters %} {% load textfilters %} - {% block title %}{{ doc.title }}{% endblock %} - {% block content %} {% origin %} {{ top|safe }} - {% include "doc/revisions_list.html" %} - {% include "doc/review/request_info.html" %} - - - - - {% if doc.rev != latest_rev %} - - {% elif doc.get_state_slug != "active" or other_reviews %} - - {% else %} - - {% endif %} - - - + {% if doc.rev != latest_rev %} +
The information below is for an old version of the document.
+ {% endif %} +
The information below is for an old version of the document
+ {% if doc.get_state_slug != "active" %} @@ -36,7 +24,6 @@ {% endif %} - {% if other_reviews %} @@ -51,10 +38,12 @@ {% endif %}
{{ doc.get_state.name }}
- -

{{ doc.type.name }}
{{ doc.name }}

- {% if doc.rev and content != None %} - 
{{ content|linkify }}
+
+
{{ doc.name }}-{{ doc.rev }}
+
+ 
{{ content|linkify }}
+
+
{% endif %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index 639e582f2..c9ff29d35 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -1,30 +1,22 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load static %} {% load ietf_filters %} - +{% load person_filters %} +{% load textfilters %} {% block title %}{{ doc.title }}{% endblock %} - {% block content %} {% origin %} {{ top|safe }} - {% include "doc/revisions_list.html" %}
- - - - - {% if doc.rev != latest_rev %} - - {% else %} - - {% endif %} - - - - + {% if doc.rev != latest_rev %} +
The information below is for an old version of the document
+ {% endif %} +
The information below is for an old version of the document
+ - - - - {% regroup sorted_relations by relationship.name as relation_groups %} {% for relation_group in relation_groups %} - + - + {% endfor %} - - + - - + - - + - -
Document @@ -36,56 +28,65 @@ {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + + Edit + {% endif %} + {{ doc.title }} - {% if snapshot %} - Snapshot - {% endif %} - + {% if snapshot %}Snapshot{% endif %} +
Last updated {{ doc.time|date:"Y-m-d" }}
{{relation_group.grouper}}{{ relation_group.grouper }} {% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %} + {% for rel in relation_group.list %} + {{ rel.target.document.canonical_name|upper|urlize_ietf_docs }} + {% if not forloop.last %},{% endif %} + {% endfor %} +
State + State + {% if not snapshot and user|has_role:"Area Director,Secretariat" %} - Edit + + Edit + {% endif %} {{ doc.get_state.name }}
IESG Telechat date {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + + Edit + {% endif %} @@ -95,66 +96,82 @@ On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat {% if doc.returning_item %}(returning item){% endif %} {% endif %} - {% if ballot_summary %} -
{{ ballot_summary }} +
+ {{ ballot_summary }} {% endif %}
Responsible AD {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit + + Edit + {% endif %} - {{doc.ad}} - {% person_link doc.ad %}
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 %} - {{doc.notify}} + {{ doc.notify|linkify }}
-

{% if not snapshot and user|has_role:"Area Director,Secretariat" %} {% if doc.get_state_slug not in approved_states %} - Edit affected RFCs - Edit last call text + + Edit affected RFCs + + + Edit last call text + {% endif %} - {% if doc.get_state_slug != 'apprsent' %} - Edit status change text + + Edit status change text + {% endif %} {% endif %} - {% if request.user|has_role:"Secretariat" and doc.get_state_slug == 'appr-pend' %} - Approve RFC status change + + Approve RFC status change + {% endif %}

- {% if doc.rev %} - 
   {{ content|sanitize|maybewordwrap|safe }}
+
+
+ {{ doc.name }}-{{ doc.rev }} +
+
+ 
   {{ content|sanitize|maybewordwrap|safe }}
+
+
{% endif %} - {% endblock %} - {% block js %} - - + + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/document_writeup.html b/ietf/templates/doc/document_writeup.html index 67ffcce0e..e6079abb3 100644 --- a/ietf/templates/doc/document_writeup.html +++ b/ietf/templates/doc/document_writeup.html @@ -1,31 +1,26 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load ietf_filters %} {% load textfilters %} - {% block title %}Writeups for {{ doc.name }}-{{ doc.rev }}{% endblock %} - {% block content %} {% origin %} {{ top|safe }} - {% for title, subtitle, writeups in sections %} -

+

{{ title|capfirst_allcaps }} {% if subtitle %} -
{{ subtitle|safe }} +
+ {{ subtitle|safe }} {% endif %}

- {% for name, text, url in writeups %} - {% if text %} - 
{{ text|linkify }}
- {% endif %} - -

- {% if can_edit %} + {% if name %}

{{ name }}

{% endif %} + {% if text %}
{{ text|linkify }}
{% endif %} + {% if can_edit %} +

{% if text %} Edit @@ -34,8 +29,8 @@ {% endif %} {{ name|lower_allcaps }} - {% endif %} -

+

+ {% endif %} {% endfor %} {% endfor %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/downref.html b/ietf/templates/doc/downref.html index 39240ffdd..3c72e280f 100644 --- a/ietf/templates/doc/downref.html +++ b/ietf/templates/doc/downref.html @@ -1,25 +1,20 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2017, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} - {% load ietf_filters static %} - {% block pagehead %} {% endblock %} - {% block title %}{{ title }}{% endblock %} - {% block content %} {% origin %}

{{ title }}

- {% if add_button %} - Add downref - + Add downref {% endif %} - @@ -32,18 +27,19 @@ {% endfor %}
RFC {{ target_doc.rfc_number }} -
{{ target_doc.title }} +
+ {{ target_doc.title }} 		{{ source_doc.name }} -
{{ source_doc.title }} +
+ {{ source_doc.title }}
{% endblock %} - {% block js %} {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/downref_add.html b/ietf/templates/doc/downref_add.html index 93ef0b14a..0d8c01c75 100644 --- a/ietf/templates/doc/downref_add.html +++ b/ietf/templates/doc/downref_add.html @@ -1,44 +1,37 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2017, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} {% load static %} - {% block title %}{{ title }}{% endblock %} - -{% block pagehead %} - {{ add_downref_form.media.css }} -{% endblock %} - +{% block pagehead %}{{ add_downref_form.media.css }}{% endblock %} {% block content %} {% origin %}

{{ title }}

- {% bootstrap_messages %} - -
This form will add entries to the downref registry.
- +
This form will add entries to the downref registry.
{% csrf_token %} {% bootstrap_form add_downref_form %} - - -

- + {% for error in add_downref_form.non_field_errors %} {% if 'There does not seem to be a normative reference' in error %} - + {% endif %} {% endfor %} - Cancel + Cancel

- - - {% endblock %} - -{% block js %} - {{ add_downref_form.media.js }} -{% endblock %} +{% block js %}{{ add_downref_form.media.js }}{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/add_iana_experts_comment.html b/ietf/templates/doc/draft/add_iana_experts_comment.html index ba9fd199e..42a03bbb3 100644 --- a/ietf/templates/doc/draft/add_iana_experts_comment.html +++ b/ietf/templates/doc/draft/add_iana_experts_comment.html @@ -1,26 +1,24 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2019, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Add IANA Experts Review State comment for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Add IANA Experts Review State comment
{{ doc }}

- -
+

+ Add IANA Experts Review State comment +
+ {{ doc }} +

+ {% csrf_token %} {% bootstrap_form form %} -

The comment will be added to the history trail.

- - - +

+ The comment will be added to the history trail. +

- Back - - + Back
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/adopt_draft.html b/ietf/templates/doc/draft/adopt_draft.html index a2c194e0e..77183bed0 100644 --- a/ietf/templates/doc/draft/adopt_draft.html +++ b/ietf/templates/doc/draft/adopt_draft.html @@ -1,30 +1,27 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - -{% block title %}Manage Document Adoption of {{ doc }} in Group{% endblock %} - +{% block title %}Manage Document Adoption of {{ doc }}{% endblock %} {% block content %} {% origin %} -

Manage Document Adoption of {{ doc }} in Group

- -

You can begin managing the group state of this draft.

- -

For a WG, the draft enters the IETF stream. - For an RG, the draft enters the IRTF stream.

- +

+ Manage Document Adoption +
+ {{ doc }} +

+

+ You can begin managing the group state of this draft. +

+

+ For a WG, the draft enters the IETF stream. + For an RG, the draft enters the IRTF stream. +

{% csrf_token %} {% bootstrap_form form %} - - - Back - -
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html index 2c67feda4..222f5a148 100644 --- a/ietf/templates/doc/draft/change_ad.html +++ b/ietf/templates/doc/draft/change_ad.html @@ -1,25 +1,21 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Change responsible AD for {{ doc.name }}-{{ doc.rev }}{% endblock %} - {% block content %} {% origin %} -

Change responsible AD
{{ doc.name }}-{{ doc.rev }}

- -
+

+ Change responsible AD +
+ {{ doc.name }}-{{ doc.rev }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - - Back - - + Back
- {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html index c9fcf906f..f78dfd161 100644 --- a/ietf/templates/doc/draft/change_consensus.html +++ b/ietf/templates/doc/draft/change_consensus.html @@ -1,25 +1,21 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Change consensus for {{ doc.name }}-{{ doc.rev }}{% endblock %} - {% block content %} {% origin %} -

Change consensus
{{ doc.name }}-{{ doc.rev }}

- -
+

+ Change consensus +
+ {{ doc.name }}-{{ doc.rev }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - - Back - - + Back
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html index 6f866c2bf..33e50a66e 100644 --- a/ietf/templates/doc/draft/change_iana_state.html +++ b/ietf/templates/doc/draft/change_iana_state.html @@ -1,24 +1,20 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Change IANA state for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Change IANA state
{{ doc }}

- -
+

+ Change IANA state +
+ {{ doc }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - Back - -
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html index 55bd1e195..83cff17ff 100644 --- a/ietf/templates/doc/draft/change_intended_status.html +++ b/ietf/templates/doc/draft/change_intended_status.html @@ -1,24 +1,20 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Change intended status for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Change intended status
{{ doc }}

- -
+

+ Change intended status +
+ {{ doc }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - Back - -
{% endblock %} diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html index d9d9c4dc0..4bb97e86e 100644 --- a/ietf/templates/doc/draft/change_shepherd_writeup.html +++ b/ietf/templates/doc/draft/change_shepherd_writeup.html @@ -1,28 +1,30 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - -{% block title %} - Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }} -{% endblock %} - +{% block title %}Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}{% endblock %} {% block content %} {% origin %} -

Edit shepherd writeup
{{ doc.canonical_name }}-{{ doc.rev }}

- -
+

+ Edit shepherd writeup +
+ {{ doc.canonical_name }}-{{ doc.rev }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - - - - Back - - + + + Back
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html index bafaeb534..dab806178 100644 --- a/ietf/templates/doc/draft/change_state.html +++ b/ietf/templates/doc/draft/change_state.html @@ -1,23 +1,21 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Change state for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Change state
{{ doc }}

- -

- Help on states -

- -
+

+ Change state +
+ {{ doc }} +

+ Help on states + {% csrf_token %} {% bootstrap_form form %} - {% if state and state.slug == "rfcqueue" %}
Note: If you pull the draft out of the @@ -25,48 +23,47 @@ by email with this comment, so they can update their queues.
{% endif %} - - - - Back - - + Back
- {% if next_states %} -

Or jump directly to

- -
- {% for n in next_states %} -
- {% csrf_token %} - - -
- {% endfor %} +
+ Or jump directly to
+ {% for n in next_states %} +
+ {% csrf_token %} + + +
+ {% endfor %} {% endif %} - {% if to_iesg_eval %} -

You could also jump directly to

- +
+ You could also jump directly to +
{% csrf_token %} But the ballot for this document has not yet been issued. - Edit ballot text + + Edit ballot text +
{% endif %} - {% if prev_state %} -

Or revert to previous state

- +
+ Or revert to previous state +
{% csrf_token %} - +
{% endif %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html index 3450736e1..83480b4d4 100644 --- a/ietf/templates/doc/draft/change_stream_state.html +++ b/ietf/templates/doc/draft/change_stream_state.html @@ -1,40 +1,33 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Change {{ state_type.label }} for {{ doc }}{% endblock %} - - {% block content %} {% origin %} -

Change {{ state_type.label }}
{{ doc }}

- +

+ Change {{ state_type.label }} +
+ {{ doc }} +

{% if next_states %} + Help on states

Move document to {{ next_states|pluralize:"to one of" }} the recommended next state{{ next_states|pluralize }}:

-

- {% for state in next_states %} - - {% endfor %} - Help on states -

+ {% for state in next_states %} + + {% endfor %} {% endif %} - -
+ {% csrf_token %} {% bootstrap_form form %} - - Back - -
{% endblock %} - {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html index b6bcf7093..4c1c50987 100644 --- a/ietf/templates/doc/draft/edit_iesg_note.html +++ b/ietf/templates/doc/draft/edit_iesg_note.html @@ -1,25 +1,20 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Edit IESG note for {{ doc.name }}{% endblock %} - {% block content %} {% origin %} -

Edit IESG note
{{ doc.name }}

- -
+

+ Edit IESG note +
+ {{ doc.name }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - Back - -
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html index 42145c782..f7d2f8178 100644 --- a/ietf/templates/doc/draft/edit_info.html +++ b/ietf/templates/doc/draft/edit_info.html @@ -1,25 +1,21 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} {% load ietf_filters %} - {% block title %}Edit info for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Edit info
{{ doc }}

- -
+

+ Edit info +
+ {{ doc }} +

+ {% csrf_token %} {% bootstrap_form form %} - - - Back - -
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/last_call_requested.html b/ietf/templates/doc/draft/last_call_requested.html index cdd48af2f..9e0ff9e5a 100644 --- a/ietf/templates/doc/draft/last_call_requested.html +++ b/ietf/templates/doc/draft/last_call_requested.html @@ -1,18 +1,18 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% block title %}Last call requested{% endblock %} - {% block content %} {% origin %}

Last call requested

- -

Your request to issue the last call has been submitted to the secretariat.

- -

Note that the last call will not actually go out until the +

+ Your request to issue the last call has been submitted to the secretariat. +

+

+ Note that the last call will not actually go out until the secretariat takes appropriate steps. This may take up to one business - day, as it involves a person taking action.

- + day, as it involves a person taking action. +

Back -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html index 0daac0ed3..fff574d96 100644 --- a/ietf/templates/doc/draft/make_last_call.html +++ b/ietf/templates/doc/draft/make_last_call.html @@ -1,31 +1,25 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Make last call for {{ doc.name }}{% endblock %} - {% block content %} {% origin %} -

Make last call
{{ doc.name }}

- -

+

+ Make last call +
+ {{ doc.name }} +

+

Last call for: {{ doc.name }} ({{ doc.group.acronym }}) to {{ doc.intended_std_level.name }}

-
{% csrf_token %} {% bootstrap_form form %} - - - Back - -
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/release_draft.html b/ietf/templates/doc/draft/release_draft.html index c0d8fedc2..12280872c 100644 --- a/ietf/templates/doc/draft/release_draft.html +++ b/ietf/templates/doc/draft/release_draft.html @@ -1,29 +1,31 @@ +{# bs5ok #} {% extends "base.html" %} {% load origin %} {% load django_bootstrap5 %} - -{% block morecss %} - .center-button-text { text-align: center;} -{% endblock %} - +{% block title %}Release draft {{ doc.name }}-{{ doc.rev }}{% endblock %} {% block content %} -
Warning
-
+

+ Release draft +
+ {{ doc.name }}-{{ doc.rev }} +

+
+ Warning: {% if doc.stream.slug == 'ise' %} - This action will unset all Independent stream state and remove the document from the Independent stream. + This action will unset all Independent Stream state and remove the document from the Independent Stream. {% else %} - This action will unset all {{doc.group.acronym|upper}} group state, and remove the document from the {{doc.stream.name}} stream.
- This is appropriate, for example, if the group decided not to adopt a document after considering it.
+ This action will unset all {{ doc.group.acronym|upper }} group state, and remove the document from the {{ doc.stream.name }} stream. +
+ This is appropriate, for example, if the group decided not to adopt a document after considering it. +
It may also be appropriate if the group is abandoning the document. {% endif %}
-
Warning
-
-
- {% csrf_token %} - {% bootstrap_form form %} - - Cancel -
-
+
+ {% csrf_token %} + {% bootstrap_form form %} + + Back +
{% endblock %} diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html index 93311c8f6..6c4aeb4b5 100644 --- a/ietf/templates/doc/draft/request_publication.html +++ b/ietf/templates/doc/draft/request_publication.html @@ -1,63 +1,62 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Request publication for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Request publication
{{ doc }}

- -

+

+ Request publication +
+ {{ doc }} +

+

Send a publication request to the RFC Editor for {{ doc }} and move it to the {{ next_state.name }} stream state. Please edit the message and remove any parts in brackets you do not - fill in. For independent submissions, see the guidelines. + fill in. For independent submissions, see the + guidelines + .

- {% if not doc.intended_std_level %}

Note: Intended RFC status is not set for the document.

{% endif %} - {% if doc.stream_id != "ise" and not consensus_filled_in %}

Note: Consensus status is not set for the document.

{% endif %} - -
+ {% csrf_token %} - -
- - +
+ +
- -
- - +
+ +
- {% if message.cc %} -
- - +
+ +
{% endif %} - {% bootstrap_form form %} - - - - Back - - + Back - -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/request_resurrect.html b/ietf/templates/doc/draft/request_resurrect.html index 42fb5e610..d2b04ed31 100644 --- a/ietf/templates/doc/draft/request_resurrect.html +++ b/ietf/templates/doc/draft/request_resurrect.html @@ -1,28 +1,25 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Request resurrection for {{ doc }}{% endblock %} - {% block content %} {% origin %} -

Request resurrection
{{ doc }}

- -

Request resurrection of the Internet-Draft {{ doc.file_tag }}?

- -

This will send a notification to the Secretariat to resurrect the I-D.

- +

+ Request resurrection +
+ {{ doc }} +

+

+ Request resurrection of the Internet-Draft {{ doc }}? +

+

+ This will send a notification to the Secretariat to resurrect the I-D. +

{% csrf_token %} - - - Back - -
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html index bf0557be2..0bbddf01c 100644 --- a/ietf/templates/doc/draft/resurrect.html +++ b/ietf/templates/doc/draft/resurrect.html @@ -1,31 +1,27 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% load django_bootstrap5 %} - {% block title %}Resurrect {{ doc }}{% endblock %} - {% block content %} {% origin %} - -

Resurrect
{{ doc }}

- -

Resurrect {{ doc }}?

- +

+ Resurrect +
+ {{ doc }} +

- This will change the status to Active{% if resurrect_requested_by %} and email a notice to {{ resurrect_requested_by }}{% endif %}. + Resurrect {{ doc }}? +

+

+ This will change the status to Active + {% if resurrect_requested_by %}and email a notice to {{ resurrect_requested_by }}{% endif %} + .

-
{% csrf_token %} - - - Back - -
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/review_possibly_replaces.html b/ietf/templates/doc/draft/review_possibly_replaces.html index a8660731e..81891d468 100644 --- a/ietf/templates/doc/draft/review_possibly_replaces.html +++ b/ietf/templates/doc/draft/review_possibly_replaces.html @@ -1,25 +1,16 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} - {% block title %}Review suggestions for documents that {{ doc }} replaces{% endblock %} - {% block content %} {% origin %}

Review suggestions for documents that {{ doc }} replaces

-
{% csrf_token %} - {% bootstrap_form form %} - - - Cancel - -
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html b/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html index 1477d9105..6962f22f6 100644 --- a/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html +++ b/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html @@ -1,18 +1,19 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2016, All Rights Reserved #} {% load origin %} - {% block title %}Duplicate RFC Editor Note Error{% endblock %} - {% block content %} {% origin %} -

There appear to be two RFC Editor Notes for this approved I-D

- -

Sorry, there appears to be an RFC Editor Note in the ballot writeup and +

Duplicate RFC Editor Note

+

+ Sorry, there appears to be an RFC Editor Note in the ballot writeup and another one in the RFC Editor Note. Please put all of the information for - the RFC Editor in the RFC Editor Note.

- -

The document writeup can be edited - Here.

- -{% endblock %} + the RFC Editor in the RFC Editor Note. +

+

+ The document writeup can be edited + here + . +

+{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html index a458bdddb..28268788e 100644 --- a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html +++ b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html @@ -1,26 +1,27 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} - {% block title %}Posting approved I-D to RFC Editor failed{% endblock %} - {% block content %} {% origin %}

Posting approved I-D to RFC Editor failed

- -

Sorry, when trying to notify the RFC Editor through HTTP, we hit an - error.

- -

We have not changed the draft state or sent the announcement +

+ Sorry, when trying to notify the RFC Editor through HTTP, we hit an + error. +

+

+ We have not changed the draft state or sent the announcement yet so if this is an intermittent error, you can go back and try - again.

- -

The error was:

-

{{ error }}

- + again. +

+

+ The error was: {{ error }} +

{% if response %} -

The response from the RFC Editor was:

-

{{ response|linebreaksbr }}

+

+ The response from the RFC Editor was: + {{ response|linebreaksbr }} +

{% endif %} - -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html index 7de045135..19557decf 100644 --- a/ietf/templates/doc/drafts_for_ad.html +++ b/ietf/templates/doc/drafts_for_ad.html @@ -1,14 +1,13 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin static %} {% load ietf_filters %} - +{% load person_filters %} {% block pagehead %} {% endblock %} - {% block title %}Documents for {{ ad_name }}{% endblock %} - {% block content %} {% origin %} {% if blocked_docs %} @@ -22,22 +21,33 @@ Discusses - {% for doc in blocked_docs %} {{ doc.displayname_with_link }} {% include "doc/search/status_columns.html" %} - {{ doc.ad|default:"" }} + + {% if doc.ad %} + {% person_link doc.ad %} + {% else %} + (None) + {% endif %} + {% for p in doc.blocking_positions %} - {{ p.balloter }} - ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }}{% endif %} - days ago{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} - for -{{ p.rev }}{% endif %})
- {% if p.is_old_pos %} - - {% endif %} + + {% if p.is_old_pos %} + {% person_link p.balloter class="text-reset" %} + {% else %} + {% person_link p.balloter %} + {% endif %} + ( + {% if p.discuss_time %}{{ p.discuss_time|timesince_days }}{% endif %} + days ago + {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %} + ) +
+ {% endfor %} @@ -45,15 +55,9 @@ {% endif %} - -

Documents for {{ ad_name }}

+

Documents for {{ ad_name }}

{% include "doc/search/search_results.html" with start_table=True end_table=True %} {% endblock %} - -{% block morecss %} - .is-blocking {box-shadow: 0 0 0 0 #000000;} -{% endblock %} - {% block js %} {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html index 7902dee0e..74b8a11b4 100644 --- a/ietf/templates/doc/drafts_in_iesg_process.html +++ b/ietf/templates/doc/drafts_in_iesg_process.html @@ -1,24 +1,27 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load ietf_filters static %} {% load textfilters person_filters %} - {% block pagehead %} {% endblock %} - {% block title %}{{ title }}{% endblock %} - {% block content %} {% origin %}

{{ title }}

- - - + + @@ -26,43 +29,56 @@ {% for state, docs in grouped_docs %} - + + + {% for doc in docs %} - - + - - - + + {% endfor %} {% endfor %}
Area{% if state.slug == "lc" %}Expires at{% else %}Date{% endif %}Area + {% if state.slug == "lc" %} + Expires at + {% else %} + Date + {% endif %} + Document Intended level AD
{{ state.name }}
{{ state.name }}
{% if doc.area_acronym %}{{ doc.area_acronym }}{% endif %} + + {% if doc.area_acronym %} + {{ doc.area_acronym }} + {% endif %} + {% if state.slug == "lc" %} {% if doc.lc_expires %}{{ doc.lc_expires|date:"Y-m-d" }}{% endif %} {% else %} {{ doc.time|date:"Y-m-d" }} {% endif %} {{ doc.name }} -
{{ doc.title }} +
+ {{ doc.title }} {% if doc.action_holders_enabled and doc.action_holders.exists %} -
Action holders: +
+ Action holders: {% for action_holder in doc.documentactionholder_set.all %} - {% person_link action_holder.person title=action_holder.role_for_doc %}{{ action_holder|action_holder_badge }}{% if not forloop.last %},{% endif %} + {% person_link action_holder.person title=action_holder.role_for_doc %} {{ action_holder|action_holder_badge }} + {% if not forloop.last %},{% endif %} {% endfor %} {% endif %} {% if doc.note %} -
Note: {{ doc.note|linkify|linebreaksbr }} +
+ Note: {{ doc.note|linkify|linebreaksbr }} {% endif %} 		{{ doc.intended_std_level.name }}{{ doc.ad.plain_name }}< + {% if doc.intended_std_level %} + {{ doc.intended_std_level.name }} + {% else %} + (None) + {% endif %} + {% person_link doc.ad %}
- {% endblock %} - {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html index c23de4186..60e35db0f 100644 --- a/ietf/templates/doc/drafts_in_last_call.html +++ b/ietf/templates/doc/drafts_in_last_call.html @@ -1,27 +1,22 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin static %} - {% block pagehead %} {% endblock %} - -{% block title %}Internet-Drafts in IETF last call{% endblock %} - +{% block title %}Internet-Drafts in IETF Last Call{% endblock %} {% block content %} {% origin %}

- Internet-Drafts in IETF last call + Internet-Drafts in IETF Last Call {% if pages %}
{{ pages }} pages {% endif %}

- - {% include "doc/search/search_results.html" with start_table=True end_table=True%} - + {% include "doc/search/search_results.html" with start_table=True end_table=True %} {% endblock %} - {% block js %} {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html index af6318d67..21e95fca6 100644 --- a/ietf/templates/doc/edit_authors.html +++ b/ietf/templates/doc/edit_authors.html @@ -1,79 +1,62 @@ +{# bs5ok #} {% extends "base.html" %} {# Copyright The IETF Trust 2021, All Rights Reserved #} {% load origin %} {% load static %} {% load django_bootstrap5 %} - {% block pagehead %} {% endblock %} - -{% block morecss %} - - #empty-author-form { - display: none; - } -{% endblock %} - -{% block title %} - Edit authors for {{ titletext }} -{% endblock %} - +{% block title %}Edit authors for {{ titletext }}{% endblock %} {% block content %} {% origin %} -

Edit authors
{{ titletext }}

- +

+ Edit authors +
+ {{ titletext }} +

{% csrf_token %} {% bootstrap_form change_basis_form %} - - - - - - - + {% bootstrap_form formset.management_form %} -
+
{% for form in formset %} -
+
+
+ +
- -
- {% bootstrap_form form layout='horizontal' %} -
+
{% bootstrap_form form layout='horizontal' %}
{% endfor %}
-
-
+ - - - Back - - + href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}"> + Back + - {% endblock %} - {% block js %} - + - {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html index 318abdee9..38e22454a 100644 --- a/ietf/templates/doc/review/complete_review.html +++ b/ietf/templates/doc/review/complete_review.html @@ -60,7 +60,7 @@