diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index 045fdc7f4..cc22e2213 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -20,7 +20,7 @@ from django.utils.html import escape
import debug # pyflakes:ignore
from ietf.doc.expire import get_expired_drafts, send_expire_notice_for_draft, expire_draft
-from ietf.doc.factories import IndividualDraftFactory, WgDraftFactory, RgDraftFactory, DocEventFactory
+from ietf.doc.factories import EditorialDraftFactory, IndividualDraftFactory, WgDraftFactory, RgDraftFactory, DocEventFactory
from ietf.doc.models import ( Document, DocReminder, DocEvent,
ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent,
WriteupDocEvent, DocRelationshipName, IanaExpertDocEvent )
@@ -2161,3 +2161,13 @@ class ShepherdWriteupTests(TestCase):
self.assertContains(r, "for Group Documents", status_code=200)
r = self.client.post(url,dict(reset_text=''))
self.assertContains(r, "for Group Documents", status_code=200)
+
+class EditorialDraftMetadataTests(TestCase):
+ def test_editorial_metadata(self):
+ draft = EditorialDraftFactory()
+ url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))
+ r = self.client.get(url)
+ q = PyQuery(r.content)
+ top_level_metadata_headings = q("tbody>tr>th:first-child").text()
+ self.assertNotIn("IESG", top_level_metadata_headings)
+ self.assertNotIn("IANA", top_level_metadata_headings)
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 3831d1016..0dc64e9f3 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -267,7 +267,7 @@
{% endif %}
- {% if not doc.stream_id == 'iab' %}
+ {% if doc.stream_id != 'iab' and doc.stream_id != 'editorial' %}
|
@@ -447,125 +447,127 @@
|
{% endif %}
- {% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %}
-
- {% if iana_review_state or can_edit_iana_state %}
-
- |
- IANA
- |
-
-
- IANA review state
-
- |
-
- {% if can_edit_iana_state and not snapshot %}
-
- Edit
-
- {% endif %}
- |
-
- {% if not iana_review_state %}
-
- (None)
-
- {% else %}
- {{ iana_review_state }}
- {% endif %}
- |
-
- {% endif %}
- {% if iana_action_state or can_edit_iana_state %}
-
- |
- {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
- |
-
-
- IANA action state
-
- |
-
- {% if can_edit_iana_state and not snapshot %}
-
- Edit
-
- {% endif %}
- |
-
- {% if not iana_action_state %}
-
- (None)
-
- {% else %}
- {{ iana_action_state }}
- {% endif %}
- |
-
- {% endif %}
- {% if iana_experts_state or can_edit_iana_state %}
-
- |
- {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
- |
-
-
- IANA expert review state
-
- |
-
- {% if can_edit_iana_state and not snapshot %}
-
- Edit
-
- {% endif %}
- |
-
- {% if not iana_experts_state %}
-
- (None)
-
- {% else %}
- {{ iana_experts_state }}
- {% endif %}
- |
-
- {% endif %}
- {% if iana_experts_comment or can_edit_iana_state %}
-
- |
- {% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %}
+ {% if doc.stream_id != 'editorial' %}
+ {% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %}
+ |
+ {% if iana_review_state or can_edit_iana_state %}
+
+ |
IANA
- {% endif %}
- |
-
- IANA expert review comments
- |
-
- {% if can_edit_iana_state and not snapshot %}
-
- Edit
+
+ |
+
+ IANA review state
- {% endif %}
-
- |
- {% if not iana_experts_comment %}
-
- (None)
-
- {% else %}
- {{ iana_experts_comment }}
- {% endif %}
- |
-
- {% endif %}
-
+
+
+ {% if can_edit_iana_state and not snapshot %}
+
+ Edit
+
+ {% endif %}
+ |
+
+ {% if not iana_review_state %}
+
+ (None)
+
+ {% else %}
+ {{ iana_review_state }}
+ {% endif %}
+ |
+
+ {% endif %}
+ {% if iana_action_state or can_edit_iana_state %}
+
+ |
+ {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
+ |
+
+
+ IANA action state
+
+ |
+
+ {% if can_edit_iana_state and not snapshot %}
+
+ Edit
+
+ {% endif %}
+ |
+
+ {% if not iana_action_state %}
+
+ (None)
+
+ {% else %}
+ {{ iana_action_state }}
+ {% endif %}
+ |
+
+ {% endif %}
+ {% if iana_experts_state or can_edit_iana_state %}
+
+ |
+ {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
+ |
+
+
+ IANA expert review state
+
+ |
+
+ {% if can_edit_iana_state and not snapshot %}
+
+ Edit
+
+ {% endif %}
+ |
+
+ {% if not iana_experts_state %}
+
+ (None)
+
+ {% else %}
+ {{ iana_experts_state }}
+ {% endif %}
+ |
+
+ {% endif %}
+ {% if iana_experts_comment or can_edit_iana_state %}
+
+ |
+ {% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %}
+ IANA
+ {% endif %}
+ |
+
+ IANA expert review comments
+ |
+
+ {% if can_edit_iana_state and not snapshot %}
+
+ Edit
+
+ {% endif %}
+ |
+
+ {% if not iana_experts_comment %}
+
+ (None)
+
+ {% else %}
+ {{ iana_experts_comment }}
+ {% endif %}
+ |
+
+ {% endif %}
+
+ {% endif %}
{% endif %}
{% if rfc_editor_state %}