Merged in [9778] from lars@netapp.com:
Remove the two remaining uses of \'rowspan\'. - Legacy-Id: 9793 Note: SVN reference [9778] has been migrated to Git commit e4113d85fcc1944cce130ffb85d3cede7478bf78
This commit is contained in:
Henrik Levkowetz
parent
1d18e9676d
commit
f56eec6630
ietf/templates
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="{{table_rows.doc}}">Document</th>
|
||||
<th>Document</th>
|
||||
<th>Type</th>
|
||||
<td class="edit"></td>
|
||||
<td>
|
||||
|
|
@ -64,6 +64,7 @@
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Last updated</th>
|
||||
<td class="edit"></td>
|
||||
<td>
|
||||
|
|
@ -76,6 +77,7 @@
|
|||
|
||||
{% if replaces or can_edit_stream_info %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Replaces</th>
|
||||
<td class="edit">
|
||||
{% if can_edit_stream_info %}
|
||||
|
|
@ -90,6 +92,7 @@
|
|||
|
||||
{% if replaced_by %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Replaced by</th>
|
||||
<td class="edit"></td>
|
||||
<td>
|
||||
|
|
@ -99,6 +102,7 @@
|
|||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Stream</th>
|
||||
<td class="edit">
|
||||
{% if can_change_stream %}
|
||||
|
|
@ -112,6 +116,7 @@
|
|||
|
||||
{% if doc.get_state_slug != "rfc" %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Intended RFC status</th>
|
||||
<td class="edit">
|
||||
{% if can_edit or can_edit_stream_info %}
|
||||
|
|
@ -125,6 +130,7 @@
|
|||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Formats</th>
|
||||
<td class="edit"></td>
|
||||
<td>
|
||||
|
|
@ -152,7 +158,7 @@
|
|||
</tbody>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="{{table_rows.stream}}">Stream</th>
|
||||
<th>Stream</th>
|
||||
{% if doc.stream %}
|
||||
<th>
|
||||
{% if doc.stream.slug != "legacy" %}
|
||||
|
|
@ -188,6 +194,7 @@
|
|||
|
||||
{% if consensus %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Consensus</th>
|
||||
<td class="edit">
|
||||
{% if can_edit or can_edit_stream_info %}
|
||||
|
|
@ -201,6 +208,7 @@
|
|||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Document shepherd</th>
|
||||
<td class="edit">
|
||||
{% if can_edit_stream_info %}
|
||||
|
|
@ -216,6 +224,7 @@
|
|||
|
||||
{% if shepherd_writeup or can_edit_shepherd_writeup %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Shepherd write-up</th>
|
||||
<td class="edit">
|
||||
{% if can_edit_shepherd_writeup %}
|
||||
|
|
@ -238,6 +247,7 @@
|
|||
|
||||
{% if published and started_iesg_process and published.time < started_iesg_process.time %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
|
@ -245,7 +255,7 @@
|
|||
</tbody>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="{{table_rows.iesg}}">IESG</th>
|
||||
<th>IESG</th>
|
||||
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
|
||||
<td class="edit">
|
||||
{% if iesg_state and can_edit %}
|
||||
|
|
@ -258,6 +268,7 @@
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Telechat date</th>
|
||||
<td class="edit">
|
||||
{% if can_edit %}
|
||||
|
|
@ -283,6 +294,7 @@
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Responsible AD</th>
|
||||
<td class="edit">
|
||||
{% if can_edit %}
|
||||
|
|
@ -297,6 +309,7 @@
|
|||
{% if iesg_state %}
|
||||
{% if doc.note or can_edit %}
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>IESG note</th>
|
||||
<td class="edit">
|
||||
{% if can_edit %}
|
||||
|
|
@ -311,6 +324,7 @@
|
|||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>Send notices to</th>
|
||||
<td class="edit">
|
||||
{% if can_edit_notify %}
|
||||
|
|
@ -327,7 +341,7 @@
|
|||
{% if iana_review_state %}
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="{{table_rows.iana}}">IANA</th>
|
||||
<th>IANA</th>
|
||||
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
|
||||
<td class="edit">
|
||||
{% if can_edit_iana_state %}
|
||||
|
|
@ -340,6 +354,7 @@
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="plain"></th>
|
||||
<th>IANA action state</th>
|
||||
<td class="edit">
|
||||
{% if can_edit_iana_state %}
|
||||
|
|
@ -357,7 +372,7 @@
|
|||
|
||||
{% if rfc_editor_state %}
|
||||
<tr>
|
||||
<th rowspan="{{table_rows.rfced}}">RFC Editor</th>
|
||||
<th>RFC Editor</th>
|
||||
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th>
|
||||
<td class="edit"></td>
|
||||
<td><a href="https://www.rfc-editor.org/queue2.html#{{ doc.name }}">{{ rfc_editor_state }}</a></td>
|
||||
|
|
|
|||
|
|
@ -13,17 +13,19 @@
|
|||
<table class="table table-condensed">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="{{table_rows.group}}">{{ group.type.name }}</th>
|
||||
<th>{{ group.type.name }}</th>
|
||||
<th>Name</th>
|
||||
<td>{{ group.name }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="plain"></td>
|
||||
<th>Acronym</th>
|
||||
<td>{{ group.acronym }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="plain"></td>
|
||||
{% if group.parent and group.parent.type_id == "area" %}
|
||||
<th>{{ group.parent.type.name }}</th>
|
||||
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
|
||||
|
|
@ -33,6 +35,7 @@
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="plain"></td>
|
||||
<th>State</th>
|
||||
<td>
|
||||
{{ group.state.name }}
|
||||
|
|
@ -42,8 +45,9 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
{% if group.features.has_chartering_process %}
|
||||
{% if group.features.has_chartering_process %}
|
||||
<tr>
|
||||
<td class="plain"></td>
|
||||
<th>Charter</th>
|
||||
<td>
|
||||
{% if group.charter %}
|
||||
|
|
@ -56,8 +60,8 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% with group.groupurl_set.all as urls %}
|
||||
|
|
@ -77,7 +81,9 @@
|
|||
{% for slug, label, roles in group.personnel %}
|
||||
<tr>
|
||||
{% if forloop.first %}
|
||||
<th rowspan="{{table_rows.personnel}}">Personnel</th>
|
||||
<th>Personnel</th>
|
||||
{% else %}
|
||||
<td class="plain"></td>
|
||||
{% endif %}
|
||||
<th>{{ label }}</th>
|
||||
<td>
|
||||
|
|
@ -96,23 +102,24 @@
|
|||
{% if group.list_email %}
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="3">Mailing list</th>
|
||||
<th>Mailing list</th>
|
||||
<th>Address</th><td>{{ group.list_email|urlize }}</td>
|
||||
</tr>
|
||||
<tr><th>To subscribe</th><td>{{ group.list_subscribe|urlize }}</td></tr>
|
||||
<tr><th>Archive</th><td>{{ group.list_archive|urlize }}</td></tr>
|
||||
<tr><td class="plain"></td><th>To subscribe</th><td>{{ group.list_subscribe|urlize }}</td></tr>
|
||||
<tr><td class="plain"></td><th>Archive</th><td>{{ group.list_archive|urlize }}</td></tr>
|
||||
</tbody>
|
||||
{% endif %}
|
||||
|
||||
{% if group.state_id != "conclude" and group.type_id != "sdo" and group.type_id != "rfcedtyp" and group.type_id != "isoc" %}
|
||||
<tbody>
|
||||
<tr>
|
||||
<th rowspan="2">Jabber chat</th>
|
||||
<th>Jabber chat</th>
|
||||
<th>Room address</th>
|
||||
<td><a href="xmpp://{{ group.acronym }}@jabber.ietf.org">xmpp://{{ group.acronym }}@jabber.ietf.org</a></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="plain"></td>
|
||||
<th>Logs</th>
|
||||
<td><a href="https://jabber.ietf.org/logs/{{ group.acronym }}/">https://jabber.ietf.org/logs/{{ group.acronym }}/</a></td>
|
||||
</tr>
|
||||
|
|
|
|||
Loading…
Reference in a new issue