diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index cce4f6109..302353421 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -107,6 +107,7 @@ def document_main(request, name, rev=None): revisions.append(h.rev) if not doc.rev in revisions: revisions.append(doc.rev) + latest_rev = doc.rev snapshot = False @@ -340,6 +341,27 @@ def document_main(request, name, rev=None): except ObjectDoesNotExist: pass + replaces = [d.name for d in doc.related_that_doc("replaces")] + replaced_by = [d.name for d in doc.related_that("replaces")] + published = doc.latest_event(type="published_rfc") + started_iesg_process = doc.latest_event(type="started_iesg_process") + + # We'd like to group rows in the document information table, with a first row giving the + # group label. This would be easy if all browsers supported the rowspan="0" (zero) + # semantics of the html standard, but only Firefox and Opera do, so we have to count + # how many entries there will be in each section here, instead. Bah! + table_rows = dict(doc=5, stream=3, iesg=5, iana=3, rfced=2) + table_rows['doc'] += 1 if replaces or can_edit_stream_info else 0 + table_rows['doc'] += 1 if replaced_by else 0 + table_rows['doc'] += 1 if doc.get_state_slug != "rfc" else 0 + table_rows['doc'] += 1 if conflict_reviews else 0 + + table_rows['stream'] += 1 if consensus else 0 + table_rows['stream'] += 1 if shepherd_writeup or can_edit_shepherd_writeup else 0 + table_rows['stream'] += 1 if published and started_iesg_process and published.time < started_iesg_process.time else 0 + + table_rows['iesg'] += 1 if iesg_state and (doc.note or can_edit) else 0 + return render_to_response("doc/document_draft.html", dict(doc=doc, group=group, @@ -350,6 +372,9 @@ def document_main(request, name, rev=None): revisions=revisions, snapshot=snapshot, latest_revision=latest_revision, + latest_rev=latest_rev, + + table_rows=table_rows, can_edit=can_edit, can_change_stream=can_change_stream, @@ -367,8 +392,8 @@ def document_main(request, name, rev=None): submission=submission, resurrected_by=resurrected_by, - replaces=[d.name for d in doc.related_that_doc("replaces")], - replaced_by=[d.name for d in doc.related_that("replaces")], + replaces=replaces, + replaced_by=replaced_by, updates=[prettify_std_name(d.name) for d in doc.related_that_doc("updates")], updated_by=[prettify_std_name(d.document.canonical_name()) for d in doc.related_that("updates")], obsoletes=[prettify_std_name(d.name) for d in doc.related_that_doc("obs")], @@ -378,7 +403,7 @@ def document_main(request, name, rev=None): proposed_status_changes=proposed_status_changes, rfc_aliases=rfc_aliases, has_errata=doc.tags.filter(slug="errata"), - published=doc.latest_event(type="published_rfc"), + published=published, file_urls=file_urls, stream_state_type_slug=stream_state_type_slug, stream_state=stream_state, @@ -390,7 +415,7 @@ def document_main(request, name, rev=None): rfc_editor_state=doc.get_state("draft-rfceditor"), iana_review_state=doc.get_state("draft-iana-review"), iana_action_state=doc.get_state("draft-iana-action"), - started_iesg_process=doc.latest_event(type="started_iesg_process"), + started_iesg_process=started_iesg_process, shepherd_writeup=shepherd_writeup, search_archive=search_archive, actions=actions, @@ -420,6 +445,8 @@ def document_main(request, name, rev=None): can_manage = can_manage_group_type(request.user, doc.group.type_id) + table_rows = dict(doc=5, wg=2, iesg=3) + return render_to_response("doc/document_charter.html", dict(doc=doc, top=top, @@ -427,12 +454,14 @@ def document_main(request, name, rev=None): content=content, txt_url=doc.href(), revisions=revisions, + latest_rev=latest_rev, snapshot=snapshot, telechat=telechat, ballot_summary=ballot_summary, group=group, milestones=milestones, can_manage=can_manage, + table_rows=table_rows, ), context_instance=RequestContext(request)) @@ -450,16 +479,21 @@ def document_main(request, name, rev=None): if doc.get_state_slug() in ("iesgeval"): ballot_summary = needed_ballot_positions(doc, doc.active_ballot().active_ad_positions().values()) + table_rows = dict(doc=4, wg=2, iesg=3) + table_rows['iesg'] += 1 if not snapshot else 0 + return render_to_response("doc/document_conflict_review.html", dict(doc=doc, top=top, content=content, revisions=revisions, + latest_rev=latest_rev, snapshot=snapshot, telechat=telechat, conflictdoc=conflictdoc, ballot_summary=ballot_summary, - approved_states=('appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent') + approved_states=('appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent'), + table_rows=table_rows, ), context_instance=RequestContext(request)) @@ -484,16 +518,21 @@ def document_main(request, name, rev=None): else: sorted_relations=None + table_rows = dict(doc=5, wg=2, iesg=3) + table_rows['iesg'] += sorted_relations.count() if sorted_relations else 0 + return render_to_response("doc/document_status_change.html", dict(doc=doc, top=top, content=content, revisions=revisions, + latest_rev=latest_rev, snapshot=snapshot, telechat=telechat, ballot_summary=ballot_summary, approved_states=('appr-pend','appr-sent'), sorted_relations=sorted_relations, + table_rows=table_rows, ), context_instance=RequestContext(request)) @@ -536,6 +575,7 @@ def document_main(request, name, rev=None): top=top, content=content, revisions=revisions, + latest_rev=latest_rev, snapshot=snapshot, can_manage_material=can_manage_material, other_types=other_types, @@ -546,6 +586,11 @@ def document_main(request, name, rev=None): raise Http404 + + + + + def document_history(request, name): doc = get_object_or_404(Document, docalias__name=name) top = render_document_top(request, doc, "history", name) diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html index 854f081aa..f071510db 100644 --- a/ietf/templates/doc/document_charter.html +++ b/ietf/templates/doc/document_charter.html @@ -13,111 +13,142 @@ {% include "doc/revisions_list.html" %} - - - - -
- {% if doc.get_state_slug != "approved" %} - Proposed charter - {% else %} - Charter - {% endif %} - - {{ group.name }} {{ group.type.name }} - ({{ group.acronym }}) + + + + {% if doc.rev != latest_rev %} + + {% else %} + + {% endif %} + + - {% if snapshot %} - Snapshot - {% endif %} - - - - - - - - - - - - - - - - - - - - - - {% if not snapshot and chartering %} + - - - + - {% if ballot_summary %} -
{{ ballot_summary }} - {% endif %} - - {% endif %} + + + + - - - - + {% if snapshot %} + Snapshot + {% endif %} + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% if not snapshot and chartering %} + + + + + {% endif %} + + + + + + + + + + + + + +
 The information below is for an old version of the document 
Title - {% if not snapshot and can_manage %} - {% doc_edit_button "charter_change_title" name=doc.name %} - {% endif %} - {{ doc.title }}
WG state{{ group.state.name }}
Charter state - {% if not snapshot and can_manage %} - {% doc_edit_button "charter_change_state" name=doc.name %} - {% endif %} - - {{ doc.get_state.name }} - - {% if chartering == "initial" %} - Initial chartering - {% endif %} - {% if chartering == "rechartering" %} - Rechartering - {% endif %} -
Telechat date - {% if can_manage %} - {% doc_edit_button "charter_telechat_date" name=doc.name %} - {% endif %} - - {% if not telechat %} - (None) - {% else %} - On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat - {% endif %} + Document
+ {% if doc.get_state_slug != "approved" %} + Proposed charter + {% else %} + Charter + {% endif %} + + {{ group.name }} {{ group.type.name }} + ({{ group.acronym }}) -
Responsible AD - {% if can_manage %} - {% doc_edit_button "charter_edit_ad" name=doc.name %} - {% endif %} - - {{ doc.ad|default:"(None)" }} -
Send notices to - {% if can_manage %} - {% doc_edit_button "charter_edit_notify" name=doc.name %} - {% endif %} - - {{ doc.notify|default:"(None)" }} -
Title + {% if not snapshot and can_manage %} + {% doc_edit_button "charter_change_title" name=doc.name %} + {% endif %} + {{ doc.title }}
Last updated{{ doc.time|date:"Y-m-d" }}
Last updated{{ doc.time|date:"Y-m-d" }}
State + {% if not snapshot and can_manage %} + {% doc_edit_button "charter_change_state" name=doc.name %} + {% endif %} + + {{ doc.get_state.name }} + + {% if chartering == "initial" %} + Initial chartering + {% endif %} + {% if chartering == "rechartering" %} + Rechartering + {% endif %} +
WG
State{{ group.state.name }}
IESG
Telechat date + {% if can_manage %} + {% doc_edit_button "charter_telechat_date" name=doc.name %} + {% endif %} + + {% if not telechat %} + (None) + {% else %} + On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat + {% endif %} + + {% if ballot_summary %} +
{{ ballot_summary }} + {% endif %} +
Responsible AD + {% if can_manage %} + {% doc_edit_button "charter_edit_ad" name=doc.name %} + {% endif %} + + {{ doc.ad|default:"(None)" }} +
Send notices to + {% if can_manage %} + {% doc_edit_button "charter_edit_notify" name=doc.name %} + {% endif %} + + {{ doc.notify|default:"(None)" }} +

diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 7efe9c152..995ede4d7 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -9,92 +9,115 @@ {% include "doc/revisions_list.html" %} - - - - - of document meta-information tables, which can either be empty or hold an alert-warning */ + +#message-row tr th { + padding: 0.2em 0.5em; +}
- {% if doc.get_state_slug not in approved_states %} - Proposed conflict review - {% else %} - Conflict review - {% endif %} - - - {{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %} - - {{conflictdoc.stream}} stream + + + + {% if doc.rev != latest_rev %} + + {% else %} + + {% endif %} + + - {% if snapshot %} - Snapshot - {% endif %} - - - - - - - - - - {% if not snapshot %} + - - - + - {% endif %} - - - - - + + + + - - - - + {% if snapshot %} + Snapshot + {% endif %} + + - - - - - + + + + + + + + + + + + + + + + + + + + {% if not snapshot %} + + + + + + {% endif %} + + + + + + + + + + + + +
 The information below is for an old version of the document 
Conflict review state - {% if not snapshot and user|has_role:"Area Director,Secretariat" %} - Edit - {% endif %} - - {{ doc.get_state.name }} -
Telechat date - {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit - {% endif %} - - {% if not telechat %} - (None) - {% else %} - 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 }} - {% endif %} - 		Document
Shepherding AD - {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit - {% endif %} - - {{doc.ad}} -
+ {% if doc.get_state_slug not in approved_states %} + Proposed conflict review + {% else %} + Conflict review + {% endif %} + + + {{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %} + + {{conflictdoc.stream}} stream -
Send notices to - {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit - {% endif %} - - {{doc.notify}} -
Last updated{{ doc.time|date:"Y-m-d" }}
Last updated{{ doc.time|date:"Y-m-d" }}
State + {% if not snapshot and user|has_role:"Area Director,Secretariat" %} + 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 + {% endif %} + + {% if not telechat %} + (None) + {% else %} + 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 }} + {% endif %} +
Shepherding AD + {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} + Edit + {% endif %} + + {{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 + {% endif %} + + {{doc.notify}} +

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

diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 7a164b36f..d7c60e264 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -18,308 +18,357 @@ {% block content %} {{ top|safe }} - - - - - - +
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 %}) + {% include "doc/revisions_list.html" %} - {% 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 doc.rev != latest_rev %} + + {% else %} + + {% endif %} + + - {% if replaces or can_edit_stream_info %} + - - - + - {% endif %} - {% if replaced_by %} - - - + + + - {% endif %} - - - - - - - - - - - - - {% if doc.get_state_slug != "rfc" %} - - - + + + - {% endif %} - - - - - - - {% if conflict_reviews %} - - - - - - {% endif %} - - - {% if doc.stream %} - - - - {% else %} - - - + {% if replaces or can_edit_stream_info %} + + + + + {% endif %} - - {% if consensus %} + {% if replaced_by %} + + + + + + {% endif %} + - - - + + + - {% endif %} - - - - - + {% if doc.get_state_slug != "rfc" %} + + + + + + {% endif %} - {% if shepherd_writeup or can_edit_shepherd_writeup %} - - - + + + - {% endif %} - {% if published and started_iesg_process and published.time < started_iesg_process.time %} + {% if conflict_reviews %} + + + + + + {% endif %} + + + + - + - {% endif %} + + + {% if doc.stream %} + + + - - - - + {% for m in milestones %} + {{ m.due|date:"M Y" }} + {% endfor %} + + {% if stream_tags %} +
{% for tag in stream_tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}
+ {% endif %} + + {% else %} + + + + {% endif %} + + + {% if consensus %} + + + + + + {% endif %} + + + + + + + + {% if shepherd_writeup or can_edit_shepherd_writeup %} + + + + + + {% endif %} + + {% if published and started_iesg_process and published.time < started_iesg_process.time %} + + + + {% endif %} + + + + + + + + + + + + + + + + + + + + + + + + + + + {% if iesg_state %} + {% if doc.note or can_edit %} + + + + + + {% endif %} + {% endif %} + + + + + + + + {% if iana_review_state %} + - - - + - - - + + + + + + + + + + {% endif %} - {% if rfc_editor_state %} - - - - - - {% endif %} + - - - - + + - {% if ballot_summary %} -
{{ ballot_summary }} - {% endif %} - - - - - - - - - - {% if iesg_state %} - {% if doc.note or can_edit %} - - - - - + + + + + {% endif %} - {% endif %} - - - - - +
 The information below is for an old version of the document 
Replaces - {% if can_edit_stream_info %} - Edit - {% endif %} - - {{ replaces|join:", "|urlize_ietf_docs|default:"(None)" }} - Document
Replaced by - {{ replaced_by|join:", "|urlize_ietf_docs }} - 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 %} +
Document stream - {% if can_change_stream %} - Edit - {% endif %} - - {{ doc.stream|default:"(None)" }} -
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 %} -
Intended RFC status - {% if can_edit or can_edit_stream_info %} - Edit - {% endif %} - - {{ doc.intended_std_level|default:"(None)" }} - 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 %} +
Other versions - {% 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 %} -
IETF conflict review{{ conflict_reviews|join:", "|urlize_ietf_docs }}
{{ doc.stream }} state - {% if doc.stream and can_edit_stream_info %} - Edit - {% endif %} - - {{ stream_state|default:"(None)" }} - - {% for m in milestones %} - {{ m.due|date:"M Y" }} - {% endfor %} - - {% if stream_tags %} -
{% for tag in stream_tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}
- {% endif %} - 		Stream state(No stream defined)
Replaces + {% if can_edit_stream_info %} + Edit + {% endif %} + + {{ replaces|join:", "|urlize_ietf_docs|default:"(None)" }} +
Replaced by + {{ replaced_by|join:", "|urlize_ietf_docs }} +
Consensus - {% if can_edit or can_edit_stream_info %} - Edit - {% endif %} - - {{ consensus }} - Stream + {% if can_change_stream %} + Edit + {% endif %} + + {{ doc.stream|default:"(None)" }} +
Document shepherd - {% if can_edit_stream_info %} - Edit - {% elif is_shepherd %} - Change Email - {% endif %} - - {% if doc.shepherd %}{{ doc.shepherd.person }}{% else %}No shepherd assigned{% endif %} -
Intended RFC status + {% if can_edit or can_edit_stream_info %} + Edit + {% endif %} + + {{ doc.intended_std_level|default:"(None)" }} +
Shepherd write-up - {% if can_edit_shepherd_writeup %} - {% url "doc_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 %} - 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 %} +
IETF conflict review{{ conflict_reviews|join:", "|urlize_ietf_docs }}
This information refers to IESG processing after the RFC was initially published:Stream
+ {% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state + + {% if doc.stream and can_edit_stream_info %} + Edit + {% endif %} + + {{ stream_state|default:"(None)" }} -
IESG state - {% if iesg_state and can_edit %} - Edit - {% endif %} - - {{ iesg_state_summary|default:"I-D Exists" }} -
Stream state(No stream defined)
Consensus + {% if can_edit or can_edit_stream_info %} + Edit + {% endif %} + + {{ consensus }} +
Document shepherd + {% if can_edit_stream_info %} + Edit + {% elif is_shepherd %} + Change Email + {% endif %} + + {% if doc.shepherd %}{{ doc.shepherd.person }}{% else %}No shepherd assigned{% endif %} +
Shepherd write-up + {% if can_edit_shepherd_writeup %} + {% url "doc_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 %} +
This information refers to IESG processing after the RFC was initially published:
IESG
IESG state + {% if iesg_state and can_edit %} + Edit + {% endif %} + + {{ iesg_state_summary|default:"I-D Exists" }} +
Telechat date + {% if can_edit %} + 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)" }} +
IESG note + {% if can_edit %} + Edit + {% endif %} + + {{ doc.note|default:"(None)"|linebreaksbr }} +
Send notices to + {% if can_edit_notify %} + Edit + {% endif %} + + {{ doc.notify|default:"(None)"}} +
IANA review state - {% if can_edit_iana_state %} - Edit - {% endif %} - - {{ iana_review_state }} - IANA
IANA action state - {% if can_edit_iana_state %} - Edit - {% endif %} - - {{ iana_action_state }} - IANA review state + {% if can_edit_iana_state %} + Edit + {% endif %} + + {{ iana_review_state }} +
IANA action state + {% if can_edit_iana_state %} + Edit + {% endif %} + + {{ iana_action_state }} +
RFC Editor state{{ rfc_editor_state }}
Telechat date - {% if can_edit %} - 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 rfc_editor_state %} +
RFC Editor
Responsible AD - {% if can_edit %} - Edit - {% endif %} - - {{ doc.ad|default:"(None)" }} -
IESG note - {% if can_edit %} - Edit - {% endif %} - - {{ doc.note|default:"(None)"|linebreaksbr }} -
RFC Editor state{{ rfc_editor_state }}
Send notices to - {% if can_edit_notify %} - Edit - {% endif %} - - {{ doc.notify|default:"(None)"}} -

@@ -364,13 +413,12 @@

- This Internet-Draft is no longer active. A copy of the expired Internet-Draft can be found at - https://www.ietf.org/archive/id/{{ doc.name }}-{{ doc.rev }}.txt + This Internet-Draft is no longer active. A copy of + the expired Internet-Draft can be found at
+ {{doc.href}}
-

This Internet-Draft is no longer active. A copy of - the expired Internet-Draft can be found here:
- {{doc.href}} +

Abstract

{{ doc.abstract }}

diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html index a1b277bfc..fa164f7ca 100644 --- a/ietf/templates/doc/document_material.html +++ b/ietf/templates/doc/document_material.html @@ -9,7 +9,17 @@ {% include "doc/revisions_list.html" %} - +
+ + + {% if doc.rev != latest_rev %} + + {% else %} + + {% endif %} + + + diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index f08b92bfc..59d09751b 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -9,99 +9,127 @@ {% include "doc/revisions_list.html" %} -
 The information below is for an old version of the document 
{% if doc.meeting_related %}Meeting{% endif %} {{ doc.type.name }}
- - - - - + {% if doc.rev != latest_rev %} +

The information below is for an old version of the document

+ {% endif %} + +
- {% if doc.get_state_slug not in approved_states %} - Proposed status change - {% else %} - Status change - {% endif %} - - {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit - {% endif %} - - {{ doc.title }} - {% if snapshot %} - Snapshot - {% endif %} -
+ + + {% if doc.rev != latest_rev %} + + {% else %} + + {% endif %} + + + + + + + + + + + + + + + + + + + + {% regroup sorted_relations by relationship.name as relation_groups %} - {% for relation_group in relation_groups %} + {% for relation_group in relation_groups %} + + + + + + {% endfor %} + - - - + + + - {% endfor %} - - - - - + + + + + - - - - + + + - + {% if ballot_summary %} +
{{ ballot_summary }} + {% endif %} + + - - - - - + + + + + - - - - - + + + + + - - - - - +
 The information below is for an old version of the document 
Document
+ {% if doc.get_state_slug not in approved_states %} + Proposed status change + {% else %} + Status change + {% endif %} + + {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} + Edit + {% endif %} + + {{ doc.title }} + {% if snapshot %} + Snapshot + {% endif %} +
Last updated{{ doc.time|date:"Y-m-d" }}
{{relation_group.grouper}}{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}
{{relation_group.grouper}}{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}State + {% if not snapshot and user|has_role:"Area Director,Secretariat" %} + Edit + {% endif %} + + {{ doc.get_state.name }} +
Review state - {% if not snapshot and user|has_role:"Area Director,Secretariat" %} - 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 - {% endif %} - - {% if not telechat %} - (None) - {% else %} - On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat - {% if doc.returning_item %}(returning item){% endif %} - {% endif %} +
Telechat date + {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} + Edit + {% endif %} + + {% if not telechat %} + (None) + {% else %} + 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 }} - {% endif %} -
Shepherding AD - {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} - Edit - {% endif %} - - {{doc.ad}} -
Shepherding AD + {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} + Edit + {% endif %} + + {{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 - {% endif %} - - {{doc.notify}} -
Send notices to + {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} + Edit + {% endif %} + + {{doc.notify}} +
Last updated{{ doc.time|date:"Y-m-d" }}

diff --git a/ietf/templates/doc/revisions_list.html b/ietf/templates/doc/revisions_list.html index 69f7ae83a..1a0ab7164 100644 --- a/ietf/templates/doc/revisions_list.html +++ b/ietf/templates/doc/revisions_list.html @@ -1,7 +1,7 @@ -

    +
    • Versions
      • {% for rev in revisions %} -
    • +
    • {{ rev }}
      • {% endfor %} diff --git a/static/css/ietf.css b/static/css/ietf.css index 2e08b338d..354a0b4b3 100644 --- a/static/css/ietf.css +++ b/static/css/ietf.css @@ -66,12 +66,27 @@ body { padding-top: 70px; } /* Style the left menu */ .nav-header { font-weight: bold; padding-bottom: 2px;} .nav-header:not(:first-child) { padding: 10px 0 2px 0 } -.nav-stacked>li, .nav-stacked>li+li { margin: 0; line-height: 1.214; } -.nav-stacked>li>a { padding: 2px 8px; } -.leftmenu { - max-width: 200px; + +.navbar { + font-family: "PT Sans Caption", "Trebuchet", "Seravek", sans-serif; +} + +.nav-stacked>li, .nav-stacked>li+li { margin: 0; line-height: 1.214; } +.nav-stacked>li>a { padding: 0.125em 0.5em; } + +.leftmenu { + max-width: 195px; + font-family: "PT Sans Caption", "Trebuchet", "Seravek", sans-serif; + font-size: 0.917em; +} +.leftmenu .nav { + overflow-wrap: break-word +} + +.navbar-brand > img { + display: inline; + margin-top: -7px; } -.leftmenu .nav { overflow-wrap: break-word } /* Hack to make anchor-targets take up a bit more space vertically to work around the position fixed navbar which otherwise covers them */ @@ -80,13 +95,13 @@ body { padding-top: 70px; } display: block; position: relative; width: 0; - height: 50px; - margin-top: -50px; + height: 65px; + margin-top: -65px; } /* Style navbar buttons */ -.navbar-btn { color:#777; } -.navbar-btn:hover { color: #333; } +/* .navbar-btn { color:#777; } */ +/* .navbar-btn:hover { color: #333; } */ /* Make the panel title font normally large */ .panel-title { font-size: 14px } @@ -189,15 +204,6 @@ ampersand you get is dependent on which fonts are available in the browser. Hac } .visible-nojs { display: block !important; } -.navbar { - font-family: "PT Sans Caption", "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -.navbar-brand > img { - display: inline; - margin-top: -7px; -} - /* Development Mode tool bar */ .navbar-dev { @@ -311,3 +317,23 @@ form.add-email textarea { table.materials .snippable { width: 25em; } + +.revlist { + font-family: "PT Sans Caption", "Trebuchet", "Seravek", sans-serif; + font-size: 0.7071em; +} +.pagination.revlist { + margin: 1em 0 0.5em 0; +} +.pagination.revlist>li>a, .pagination.revlist>li>a:hover, .pagination.revlist>li>a:active { + padding: 4px 8px; +} +.revlist>li.warning>a, .revlist>li.warning>a:hover, .revlist>li.warning>a:active { + background-color: #f9c0a4; /* warning colour */ +} + +/* This is for the