Skip to content

Commit 454da29

Browse files
levkowetzlevkowetz
committed
Reorder the state information for a document into related groups, separated by rulers. Add some indentation to the template code to make it a bit easier to read in some places.
 - Legacy-Id: 3141
1 parent 34128e7 commit 454da29

1 file changed

Lines changed: 57 additions & 19 deletions

File tree

‎ietf/templates/idrfc/doc_tab_document_id.html‎

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,21 @@
3333
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
{% endcomment %}
3535

36-
{% load ietf_filters %}
36+
{% load ietf_filters ietf_streams %}
3737

3838
{% block doc_metatable %}
39-
<tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}
40-
{% with doc.replaces as r %}{% if r %}<br />Replaces {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}{% endif %}{% endwith %}
41-
</td></tr>
39+
<tr><td colspan='2'>{{ doc.draft_status }} {% ifnotequal doc.draft_status "RFC" %}Internet-Draft ({{ doc.submission|safe }}){% endifnotequal %}
40+
{% ifequal doc.draft_status "Expired" %}
41+
{% if doc.resurrect_requested_by %}(resurrect requested by {{ doc.resurrect_requested_by }}){% endif %}
42+
{% endifequal %} </td>
43+
44+
<tr><td>Document Stream:</td><td> {{ stream_info.stream.name|default:"No stream defined" }}</td></tr>
45+
4246
<tr><td>Last updated:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
43-
<tr><td><a href="/idtracker/help/state/">State</a>:</td><td>
44-
{{ doc.friendly_state|safe }}
45-
{% if doc.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.draft_name}}">{{ doc.rfc_editor_state|escape }}</a>{% endif %}
46-
{% ifequal doc.draft_status "Expired" %}
47-
{% if doc.resurrect_requested_by %}(resurrect requested by {{ doc.resurrect_requested_by }}){% endif %}
48-
{% endifequal %}
49-
{% if doc.in_ietf_process %}{% if doc.ietf_process.telechat_date %}<br/>On agenda of {{ doc.ietf_process.telechat_date }} IESG telechat {% if doc.ietf_process.telechat_returning_item %} (returning item){%endif%}{%endif%}{% if doc.ietf_process.has_active_iesg_ballot %}<br/><i>({{ doc.ietf_process.iesg_ballot_needed }})</i>{%endif%}{%endif%}
50-
</td></tr>
51-
<tr><td>Intended status:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.intended_maturity_level|default:"-" }}{% else %}-{%endif%}</td></tr>
52-
<tr><td>Submission:</td><td>{{ doc.submission }}</td></tr>
53-
<tr><td>Responsible AD:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"-"|escape }}{%else%}-{%endif%}</td></tr>
54-
{% if doc.in_ietf_process and doc.ietf_process.iesg_note %}<tr><td>IESG Note:</td><td>{{ doc.ietf_process.iesg_note|format_textarea|safe }}</td></tr>{% endif %}
55-
{% if user|in_group:"Area_Director,Secretariat" %}
56-
{% if doc.in_ietf_process %}<tr><td>Send notices to:</td><td>{{ doc.ietf_process.state_change_notice_to}}</td></tr>{% endif %}
57-
{% endif %}{# if user|in_group:... #}
47+
48+
{% with doc.replaces as r %}{% if r %}<tr><td>Replaces:</td><td> {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}</td></tr>{% endif %}{% endwith %}
49+
50+
<tr><td>Intended RFC status:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.intended_maturity_level|default:"-" }}{% else %}-{%endif%}</td></tr>
5851

5952
{% ifequal doc.draft_status "Active" %}
6053
<tr><td>Other versions:</td><td>
@@ -70,9 +63,54 @@
7063
<a href="http://tools.ietf.org/html/{{doc.draft_name_and_revision}}">html</a>
7164
</td></tr>
7265
{% endifequal %}
66+
67+
68+
<tr><td colspan='2'><hr size='1' noshade /></td></tr>
69+
70+
{% ifequal stream_info.stream.name "IETF" %}
71+
<tr>
72+
<td>IETF WG State:</td>
73+
<td>{{ stream_info.state.name }} ({{ stream_info.streamed.group }})
74+
{% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}
75+
</td>
76+
</tr>
77+
{% else %}
78+
{% if stream_info.stream %}
79+
<tr>
80+
<td>{{ stream_info.stream.name }} status:</td>
81+
<td>
82+
{{ stream_info.state.name }} {% if stream_info.streamed.group %}({{ stream_info.streamed.group }}) {% endif %}
83+
{% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}
84+
</td>
85+
</tr>
86+
{% endif %}
87+
{% endifequal %}
88+
<tr><td>Document shepherd:</td><td>{{ stream_info.shepherd|default:"" }}</td></tr>
89+
90+
<tr><td colspan='2'><hr size='1' noshade /></td></tr>
91+
92+
93+
<tr><td><a href="/idtracker/help/state/">IESG State</>:</td><td> {{ doc.friendly_state|safe }}
94+
{% if doc.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.draft_name}}">{{ doc.rfc_editor_state|escape }}</a>{% endif %}
95+
{% ifequal doc.draft_status "Expired" %}
96+
{% if doc.resurrect_requested_by %}(resurrect requested by {{ doc.resurrect_requested_by }}){% endif %}
97+
{% endifequal %}
98+
{% if doc.in_ietf_process %}{% if doc.ietf_process.telechat_date %}<br/>On agenda of {{ doc.ietf_process.telechat_date }} IESG telechat {% if doc.ietf_process.telechat_returning_item %} (returning item){%endif%}{%endif%}{% if doc.ietf_process.has_active_iesg_ballot %}<br/><i>({{ doc.ietf_process.iesg_ballot_needed }})</i>{%endif%}{%endif%}
99+
</td></tr>
100+
{# <tr><td>Submission:</td><td>{{ doc.submission|safe }}</td></tr> #}
101+
<tr><td>Responsible AD:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"-"|escape }}{%else%}-{%endif%}</td></tr>
102+
{% if doc.in_ietf_process and doc.ietf_process.iesg_note %}<tr><td>IESG Note:</td><td>{{ doc.ietf_process.iesg_note|format_textarea|safe }}</td></tr>{% endif %}
103+
{% if user|in_group:"Area_Director,Secretariat" %}
104+
{% if doc.in_ietf_process %}<tr><td>Send notices to:</td><td>{{ doc.ietf_process.state_change_notice_to}}</td></tr>{% endif %}
105+
{% endif %}{# if user|in_group:... #}
106+
107+
<tr><td colspan='2'><hr size='1' noshade /></td></tr>
108+
109+
73110
{% endblock doc_metatable %}
74111

75112
{% block doc_metalinks %}
113+
{% edit_actions doc %}
76114
<div>
77115
<a href="mailto:{{doc.draft_name}}@tools.ietf.org?subject=Mail%20regarding%20{{doc.draft_name}}" rel="nofollow">Email Authors</a>
78116
| <a href="/ipr/search/?option=document_search&amp;id_document_tag={{doc.tracker_id}}" rel="nofollow">IPR Disclosures</a>

0 commit comments

Comments
 (0)