diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index f74b3b8c8..d6fc15904 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -13,7 +13,7 @@ {% endblock %} {% block morecss %} -.inline { display: inline; } +.inline { display: inline; } {% endblock %} {% block title %} @@ -34,75 +34,75 @@
The information below is for an old version of the document | - {% else %} -- {% endif %} + {% if doc.rev != latest_rev %} + | The information below is for an old version of the document | + {% else %} ++ {% endif %} | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Document | -Type | -- | - {% if doc.get_state_slug == "rfc" %} - RFC - {{ doc.std_level }} - ({% if published %}{{ published.time|date:"F Y" }}{% else %}publication date unknown{% endif %}{% if has_errata %}; Errata{% else %}; No errata{% endif %}) + | Document | +Type | ++ |
+ {% if doc.get_state_slug == "rfc" %}
+ RFC - {{ doc.std_level }}
+ ({% if published %}{{ published.time|date:"F Y" }}{% else %}publication date unknown{% endif %}{% if has_errata %}; Errata{% else %}; No errata{% endif %})
- {% if obsoleted_by %} Obsoleted by {{ obsoleted_by|join:", "|urlize_ietf_docs }} {% endif %}
- {% if updated_by %}Updated by {{ updated_by|join:", "|urlize_ietf_docs }} {% endif %}
- {% if obsoletes %}Obsoletes {{ obsoletes|join:", "|urlize_ietf_docs }} {% endif %}
- {% if updates %}Updates {{ updates|join:", "|urlize_ietf_docs }} {% endif %}
- {% if status_changes %}Status changed by {{ status_changes|join:", "|urlize_ietf_docs }} {% endif %}
- {% if proposed_status_changes %}Proposed status changed by {{ proposed_status_changes|join:", "|urlize_ietf_docs }} {% endif %}
- {% if rfc_aliases %}Also known as {{ rfc_aliases|join:", "|urlize_ietf_docs }} {% endif %}
- {% if draft_name %}Was {{ draft_name }} {% if submission %}({{ submission|safe }}){% endif %} {% endif %}
- {% else %}
- {{ doc.get_state }} Internet-Draft {% if submission %}({{ submission|safe }}){% endif %}
- {% if resurrected_by %}- resurrect requested by {{ resurrected_by }}{% endif %}
- {% endif %}
- |
+ {% if obsoleted_by %}||||||||
- | Last updated | -- | - {{ doc.time|date:"Y-m-d" }} - {% if latest_revision and latest_revision.time.date != doc.time.date %} - (latest revision {{ latest_revision.time|date:"Y-m-d" }}) - {% endif %} - | ++ | Last updated | ++ | + {{ doc.time|date:"Y-m-d" }} + {% if latest_revision and latest_revision.time.date != doc.time.date %} + (latest revision {{ latest_revision.time|date:"Y-m-d" }}) + {% endif %} + | ||||||||
- | Replaces | -+ | |||||||||||||
+ | Replaces | +{% if can_edit_stream_info and not snapshot %} - Edit - {% endif %} - | -- {{ replaces|join:", "|urlize_ietf_docs|default:"(None)" }} - | -+ {{ replaces|join:", "|urlize_ietf_docs|default:"(None)" }} + | + {% endif %} {% if replaced_by %} -|||||||||||
- | Replaced by | -- | - {{ replaced_by|join:", "|urlize_ietf_docs }} - | -||||||||||||
+ | Replaced by | ++ | + {{ replaced_by|join:", "|urlize_ietf_docs }} + | +||||||||||||
- | Stream | -+ | Stream | +{% if can_change_stream and not snapshot %} - Edit - {% endif %} - | -- {{ doc.stream|default:"(None)" }} - | + Edit + {% endif %} + ++ {{ doc.stream|default:"(None)" }} + | |||||||||
- | Intended RFC status | -+ | |||||||||||||
+ | Intended RFC status | +{% if can_edit_stream_info and not snapshot %} Edit - {% endif %} - | -- {{ doc.intended_std_level|default:"(None)" }} - | -+ {{ doc.intended_std_level|default:"(None)" }} + | + {% endif %}|||||||||||
- | Formats | -- |
- {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %} Expired & archived {% endif %}
- {% if file_urls %}
- {% for label, url in file_urls %}
-
-
- {{ label }}
- {% endfor %}
- {% else %}
- (not online)
- {% endif %}
- |
+ Formats | ++ |
+ {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %} Expired & archived {% endif %}
+ {% if file_urls %}
+ {% for label, url in file_urls %}
+
+
+ {{ label }}
+ {% endfor %}
+ {% else %}
+ (not online)
+ {% endif %}
+ |
|||||||||
- | {{ check.checker|title }} | -- | - {% if check.errors or check.warnings %} - {{ check.symbol|safe }} - {% else %} - {{ check.symbol|safe }} - {% endif %} - - {{ check.errors }} errors, {{ check.warnings }} warnings. - - {% include "doc/yang-check-modal-overlay.html" %} - | -||||||||||||
+ | {{ check.checker|title }} | ++ | + {% if check.errors or check.warnings %} + {{ check.symbol|safe }} + {% else %} + {{ check.symbol|safe }} + {% endif %} + + {{ check.errors }} errors, {{ check.warnings }} warnings. + + {% include "doc/yang-check-modal-overlay.html" %} + | +||||||||||||
Reviews | -+ | {% for review_assignment in review_assignments %} {% include "doc/review_assignment_summary.html" with current_doc_name=doc.name current_rev=doc.rev %} @@ -232,39 +232,39 @@ {% if conflict_reviews %} - | |||||||||||||
- | IETF conflict review | -- | {{ conflict_reviews|join:", "|urlize_ietf_docs }} | -IETF conflict review | ++ | {{ conflict_reviews|join:", "|urlize_ietf_docs }} | + {% endif %} {% with doc.documenturl_set.all as urls %} {% if urls or can_edit_stream_info or can_edit_individual %} -|||||||||
Additional URLs | -- {% if can_edit_stream_info or can_edit_individual %} - Edit - {% endif %} - | -
- {% if urls or doc.group and doc.group.list_archive %}
-
| + {% if can_edit_stream_info or can_edit_individual %} + Edit {% endif %} | -
+ {% if urls or doc.group and doc.group.list_archive %}
+
|
+
{% endif %}
{% endwith %}
@@ -272,55 +272,55 @@
|||||||||||
Stream | - {% if doc.stream %} -- {% if doc.stream.slug != "legacy" %} - - {% if doc.stream_id == 'ietf' %} WG {% else %} {{ doc.stream }} {% endif %} state - - {% else %} - Legacy state - {% endif %} - | -+ | Stream | + {% if doc.stream %} ++ {% if doc.stream.slug != "legacy" %} + + {% if doc.stream_id == 'ietf' %} WG {% else %} {{ doc.stream }} {% endif %} state + + {% else %} + Legacy state + {% endif %} + | +{% if doc.stream and can_edit_stream_info and doc.stream.slug != "legacy" and not snapshot %} - Edit - {% endif %} - | -- {{ stream_state|default:"(None)" }} + Edit + {% endif %} + | ++ {{ stream_state|default:"(None)" }} - {% if milestones %} (wg milestone{{ milestones|pluralize }}: - {% for m in milestones %} - {{ m.due|date:"M Y" }} - {{m}}{% if not forloop.last %},{% endif %} - {% endfor %}) - {% endif %} + {% if milestones %} (wg milestone{{ milestones|pluralize }}: + {% for m in milestones %} + {{ m.due|date:"M Y" }} - {{m}}{% if not forloop.last %},{% endif %} + {% endfor %}) + {% endif %} - {% if stream_tags %} - - {% endif %} - | - {% else %} -Stream state | -- | (No stream defined) | - {% endif %} + {% if stream_tags %} + + {% endif %} + + {% else %} +Stream state | ++ | (No stream defined) | + {% endif %}||
- | Consensus Boilerplate | -+ | |||||||||||||
+ | Consensus Boilerplate | +{% if can_edit_stream_info and not snapshot %} - Edit - {% endif %} - | -- {{ consensus }} - | -+ {{ consensus }} + | + {% endif %} {% if presentations or user|has_role:"Secretariat,Area Director,WG Chair,WG Secretary,RG Chair,RG Secretary,IRTF Chair,Team Chair" or can_edit_stream_info %} @@ -338,10 +338,10 @@{% if presentations %} {% for pres in presentations %} - - {{ pres.session.short_name }} at {{ pres.session.meeting }} - {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %}, {% endif %} - {% endfor %} + + {{ pres.session.short_name }} at {{ pres.session.meeting }} + {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %}, {% endif %} + {% endfor %} {% else %} None {% endif %} @@ -350,166 +350,166 @@ {% endif %} {% if doc.stream_id == 'ietf' or doc.stream_id == 'ise' or doc.stream_id == 'irtf' %} - | ||||||||||
- | Document shepherd | -+ | |||||||||||||
+ | Document shepherd | +- {% if can_edit_stream_info and not snapshot %} - Edit - {% elif is_shepherd %} - Change Email - {% endif %} - | -- {% if doc.shepherd %}{{ doc.shepherd.person }}{% else %}No shepherd assigned{% endif %} - | -+ {% if doc.shepherd %}{{ doc.shepherd.person }}{% else %}No shepherd assigned{% endif %} + | + {% if shepherd_writeup or can_edit_shepherd_writeup %} -|||||||||||
- | Shepherd write-up | -- {% if can_edit_shepherd_writeup %} - {% url 'ietf.doc.views_draft.edit_shepherd_writeup' name=doc.name as doc_edit_url %} - {% if doc_edit_url %} - Edit - {% endif %} - {% endif %} - | -- {% if shepherd_writeup %} - Show - (last changed {{ shepherd_writeup.time|date:"Y-m-d"}}) - {% else %} - (None) - {% endif %} - | -||||||||||||
+ | Shepherd write-up | ++ {% if can_edit_shepherd_writeup %} + {% url 'ietf.doc.views_draft.edit_shepherd_writeup' name=doc.name as doc_edit_url %} + {% if doc_edit_url %} + Edit + {% endif %} + {% endif %} + | ++ {% if shepherd_writeup %} + Show + (last changed {{ shepherd_writeup.time|date:"Y-m-d"}}) + {% else %} + (None) + {% endif %} + | +||||||||||||
- | RFC Editor Note | -- {% if can_edit_stream_info %} - Edit - {% endif %} - | -- {% if doc.has_rfc_editor_note %}(last changed {{ doc.has_rfc_editor_note|date:"Y-m-d"}}){% else %}(None){% endif %} - | -||||||||||||
+ | RFC Editor Note | ++ {% if can_edit_stream_info %} + Edit + {% endif %} + | ++ {% if doc.has_rfc_editor_note %}(last changed {{ doc.has_rfc_editor_note|date:"Y-m-d"}}){% else %}(None){% endif %} + | +||||||||||||
- | This information refers to IESG processing after the RFC was initially published: | -||||||||||||||
+ | This information refers to IESG processing after the RFC was initially published: | +||||||||||||||
IESG | -IESG state | -- {% if iesg_state.slug != 'idexists' and can_edit %} - Edit - {% endif %} - | -- {{ iesg_state_summary|default:"I-D Exists" }} - | -||||||||||||
IESG | +IESG state | ++ {% if iesg_state.slug != 'idexists' and can_edit %} + Edit + {% endif %} + | ++ {{ iesg_state_summary|default:"I-D Exists" }} + | +||||||||||||
- | Consensus Boilerplate | -- {% if can_edit or can_edit_stream_info and not snapshot %} - Edit - {% endif %} - | -- {{ consensus }} - | -||||||||||||
+ | Consensus Boilerplate | ++ {% if can_edit or can_edit_stream_info and not snapshot %} + Edit + {% endif %} + | ++ {{ consensus }} + | +||||||||||||
- | Telechat date | -- {% if can_edit and not snapshot %} - Edit - {% endif %} - | -- {% if telechat %} - On agenda of {{ telechat.telechat_date }} IESG telechat - {% if telechat.returning_item %} - (returning item) - {% endif %} - {% else %} - {% if can_edit %} - (None) - {% endif %} - {% endif %} + | ||||||||||||
+ | Telechat date | ++ {% if can_edit and not snapshot %} + Edit + {% endif %} + | +
+ {% if telechat %}
+ On agenda of {{ telechat.telechat_date }} IESG telechat
+ {% if telechat.returning_item %}
+ (returning item)
+ {% endif %}
+ {% else %}
+ {% if can_edit %}
+ (None)
+ {% endif %}
+ {% endif %}
- {% if ballot_summary %}
- {{ ballot_summary }} - {% endif %} - |
- ||||||||||||
- | Responsible AD | -- {% if can_edit %} - Edit - {% endif %} - | -- {{ doc.ad|default:"(None)" }} - | -||||||||||||
+ | Responsible AD | ++ {% if can_edit %} + Edit + {% endif %} + | ++ {{ doc.ad|default:"(None)" }} + | +||||||||||||
- | IESG note | -- {% if can_edit and not snapshot %} - Edit - {% endif %} - | -- {{ doc.note|default:"(None)"|linebreaksbr }} - | -||||||||||||
+ | IESG note | ++ {% if can_edit and not snapshot %} + Edit + {% endif %} + | ++ {{ doc.note|default:"(None)"|linebreaksbr }} + | +||||||||||||
- | Send notices to | -- {% if can_edit_notify and not snapshot %} - Edit - {% endif %} - | -- {{ doc.notify|default:"(None)"}} - | -||||||||||||
+ | Send notices to | ++ {% if can_edit_notify and not snapshot %} + Edit + {% endif %} + | ++ {{ doc.notify|default:"(None)"}} + | +||||||||||||
IANA | -IANA review state | -+ | IANA | +IANA review state | +{% if can_edit_iana_state and not snapshot %} - Edit - {% endif %} - | -- {{ iana_review_state }} - | + Edit + {% endif %} + ++ {{ iana_review_state }} + | ||||||||
- | IANA action state | -+ | IANA action state | +{% if can_edit_iana_state and not snapshot %} - Edit - {% endif %} - | -- {{ iana_action_state }} - | + Edit + {% endif %} + ++ {{ iana_action_state }} + | |||||||||
RFC Editor | -RFC Editor state | -- | {{ rfc_editor_state }} | -||||||||||||
RFC Editor | +RFC Editor state | ++ | {{ rfc_editor_state }} | +