altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Style the metadata tables for groups, documents, etc. like Henrik prefers.

Browse source 
Commit ready for merge.
 - Legacy-Id: 9856
This commit is contained in:
Lars Eggert 2015-07-22 14:06:02 +00:00
parent 0293061c3f
commit 9133b9469e
6 changed files with 69 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ietf/templates/doc/document_charter.html
View file

@ -27,11 +27,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="meta">
<tr> <tr>
<th>Document</th> <th>Document</th>
<th class="text-right"> <th>
{% if doc.get_state_slug != "approved" %} {% if doc.get_state_slug != "approved" %}
Proposed charter Proposed charter
{% else %} {% else %}
@ -49,7 +49,7 @@
</td> </td>
</tr> </tr>
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Title</th> <th>Title</th>
<td class="edit"> <td class="edit">
@ -60,14 +60,14 @@
<td>{{ doc.title }}</td> <td>{{ doc.title }}</td>
</tr> </tr>
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td> <td>{{ doc.time|date:"Y-m-d" }}</td>
</tr> </tr>
<tr class="plain"> <tr>
<td></td> <td></td>
<th><a href="/doc/help/state/charter/">State</a></th> <th><a href="/doc/help/state/charter/">State</a></th>
<td class="edit"> <td class="edit">
@ -89,19 +89,19 @@
</tbody> </tbody>
<tbody> <tbody class="meta">
<tr> <tr>
<th>WG</th> <th>WG</th>
<th class="text-right">State</th> <th>State</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ group.state.name }}</td> <td>{{ group.state.name }}</td>
</tr> </tr>
</tbody> </tbody>
<tbody> <tbody class="meta">
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th class="text-right">Responsible AD</th> <th>Responsible AD</th>
<td class="edit"> <td class="edit">
{% if can_manage %} {% if can_manage %}
{% doc_edit_button "charter_edit_ad" name=doc.name %} {% doc_edit_button "charter_edit_ad" name=doc.name %}
@ -113,7 +113,7 @@
</tr> </tr>
{% if not snapshot and chartering %} {% if not snapshot and chartering %}
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
@ -135,7 +135,7 @@
</tr> </tr>
{% endif %} {% endif %}
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">

16
ietf/templates/doc/document_conflict_review.html
View file

@ -23,10 +23,10 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="meta">
<tr> <tr>
<th>Document</th> <th>Document</th>
<th class="text-right"> <th>
{% if doc.get_state_slug not in approved_states %} {% if doc.get_state_slug not in approved_states %}
Proposed conflict review Proposed conflict review
{% else %} {% else %}
@ -46,14 +46,14 @@
</td> </td>
</tr> </tr>
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td> <td>{{ doc.time|date:"Y-m-d" }}</td>
</tr> </tr>
<tr class="plain"> <tr>
<td></td> <td></td>
<th><a href="/doc/help/state/conflict-review/">State</a></th> <th><a href="/doc/help/state/conflict-review/">State</a></th>
<td class="edit"> <td class="edit">
@ -67,10 +67,10 @@
</tr> </tr>
</tbody> </tbody>
<tbody> <tbody class="meta">
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th class="text-right">Shepherding AD</th> <th>Shepherding AD</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
<a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a> <a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
@ -82,7 +82,7 @@
</tr> </tr>
{% if not snapshot %} {% if not snapshot %}
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
@ -105,7 +105,7 @@
</tr> </tr>
{% endif %} {% endif %}
<tr class="plain"> <tr>
<td></td> <td></td>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">

42
ietf/templates/doc/document_draft.html
View file

@ -38,7 +38,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="meta">
<tr> <tr>
<th>Document</th> <th>Document</th>
<th>Type</th> <th>Type</th>
@ -64,7 +64,7 @@
</tr> </tr>
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
@ -77,7 +77,7 @@
{% if replaces or can_edit_stream_info %} {% if replaces or can_edit_stream_info %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Replaces</th> <th>Replaces</th>
<td class="edit"> <td class="edit">
{% if can_edit_stream_info %} {% if can_edit_stream_info %}
@ -92,7 +92,7 @@
{% if replaced_by %} {% if replaced_by %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Replaced by</th> <th>Replaced by</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
@ -132,7 +132,7 @@
{% endif %} {% endif %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Stream</th> <th>Stream</th>
<td class="edit"> <td class="edit">
{% if can_change_stream %} {% if can_change_stream %}
@ -146,7 +146,7 @@
{% if doc.get_state_slug != "rfc" %} {% if doc.get_state_slug != "rfc" %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Intended RFC status</th> <th>Intended RFC status</th>
<td class="edit"> <td class="edit">
{% if can_edit or can_edit_stream_info %} {% if can_edit or can_edit_stream_info %}
@ -160,7 +160,7 @@
{% endif %} {% endif %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Formats</th> <th>Formats</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
@ -179,7 +179,7 @@
{% if conflict_reviews %} {% if conflict_reviews %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>IETF conflict review</th> <th>IETF conflict review</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td> <td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td>
@ -187,7 +187,7 @@
{% endif %} {% endif %}
</tbody> </tbody>
<tbody> <tbody class="meta">
<tr> <tr>
<th>Stream</th> <th>Stream</th>
{% if doc.stream %} {% if doc.stream %}
@ -225,7 +225,7 @@
{% if consensus %} {% if consensus %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Consensus</th> <th>Consensus</th>
<td class="edit"> <td class="edit">
{% if can_edit or can_edit_stream_info %} {% if can_edit or can_edit_stream_info %}
@ -239,7 +239,7 @@
{% endif %} {% endif %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Document shepherd</th> <th>Document shepherd</th>
<td class="edit"> <td class="edit">
{% if can_edit_stream_info %} {% if can_edit_stream_info %}
@ -255,7 +255,7 @@
{% if shepherd_writeup or can_edit_shepherd_writeup %} {% if shepherd_writeup or can_edit_shepherd_writeup %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Shepherd write-up</th> <th>Shepherd write-up</th>
<td class="edit"> <td class="edit">
{% if can_edit_shepherd_writeup %} {% if can_edit_shepherd_writeup %}
@ -278,13 +278,13 @@
{% if published and started_iesg_process and published.time < started_iesg_process.time %} {% if published and started_iesg_process and published.time < started_iesg_process.time %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th> <th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th>
</tr> </tr>
{% endif %} {% endif %}
</tbody> </tbody>
<tbody> <tbody class="meta">
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th> <th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
@ -299,7 +299,7 @@
</tr> </tr>
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
{% if can_edit %} {% if can_edit %}
@ -325,7 +325,7 @@
</tr> </tr>
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Responsible AD</th> <th>Responsible AD</th>
<td class="edit"> <td class="edit">
{% if can_edit %} {% if can_edit %}
@ -340,7 +340,7 @@
{% if iesg_state %} {% if iesg_state %}
{% if doc.note or can_edit %} {% if doc.note or can_edit %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>IESG note</th> <th>IESG note</th>
<td class="edit"> <td class="edit">
{% if can_edit %} {% if can_edit %}
@ -355,7 +355,7 @@
{% endif %} {% endif %}
<tr> <tr>
<th class="plain"></th> <th></th>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">
{% if can_edit_notify %} {% if can_edit_notify %}
@ -370,7 +370,7 @@
</tbody> </tbody>
{% if iana_review_state %} {% if iana_review_state %}
<tbody> <tbody class="meta">
<tr> <tr>
<th>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> <th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
@ -385,7 +385,7 @@
</tr> </tr>
<tr> <tr>
<th class="plain"></th> <th></th>
<th>IANA action state</th> <th>IANA action state</th>
<td class="edit"> <td class="edit">
{% if can_edit_iana_state %} {% if can_edit_iana_state %}
@ -399,7 +399,7 @@
</tbody> </tbody>
{% endif %} {% endif %}
<tbody> <tbody class="meta">
{% if rfc_editor_state %} {% if rfc_editor_state %}
<tr> <tr>
<th>RFC Editor</th> <th>RFC Editor</th>

18
ietf/templates/doc/document_status_change.html
View file

@ -23,10 +23,10 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="meta">
<tr> <tr>
<th>Document</th> <th>Document</th>
<th class="text-right"> <th>
{% if doc.get_state_slug not in approved_states %} {% if doc.get_state_slug not in approved_states %}
Proposed status change Proposed status change
{% else %} {% else %}
@ -46,7 +46,7 @@
</td> </td>
</tr> </tr>
<tr class="plain"> <tr>
<th></th> <th></th>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
@ -56,7 +56,7 @@
{% regroup sorted_relations by relationship.name as relation_groups %} {% regroup sorted_relations by relationship.name as relation_groups %}
{% for relation_group in relation_groups %} {% for relation_group in relation_groups %}
<tr class="plain"> <tr>
<th></th> <th></th>
<th>{{relation_group.grouper}}</th> <th>{{relation_group.grouper}}</th>
<td class="edit"></td> <td class="edit"></td>
@ -64,7 +64,7 @@
</tr> </tr>
{% endfor %} {% endfor %}
<tr class="plain"> <tr>
<th></th> <th></th>
<th><a href="{% url "state_help" type="status-change" %}">State</a></th> <th><a href="{% url "state_help" type="status-change" %}">State</a></th>
<td class="edit"> <td class="edit">
@ -78,10 +78,10 @@
</tr> </tr>
</tbody> </tbody>
<tbody> <tbody class="meta">
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th class="text-right">Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
<a class="btn btn-default btn-xs pull-right" href="{% url "status_change_telechat_date" name=doc.name %}">Edit</a> <a class="btn btn-default btn-xs pull-right" href="{% url "status_change_telechat_date" name=doc.name %}">Edit</a>
@ -101,7 +101,7 @@
</td> </td>
</tr> </tr>
<tr class="plain"> <tr>
<th></th> <th></th>
<th>Shepherding AD</th> <th>Shepherding AD</th>
<td class="edit"> <td class="edit">
@ -114,7 +114,7 @@
</td> </td>
</tr> </tr>
<tr class="plain"> <tr>
<th></th> <th></th>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">

27
ietf/templates/group/group_about.html
View file

@ -10,8 +10,9 @@
<p class="alert alert-warning"><b>Note:</b> The data for concluded {{ group.type.name }}s is occasionally incorrect.</p> <p class="alert alert-warning"><b>Note:</b> The data for concluded {{ group.type.name }}s is occasionally incorrect.</p>
{% endif %} {% endif %}
<br>
<table class="table table-condensed"> <table class="table table-condensed">
<tbody> <tbody class="meta">
<tr> <tr>
<th>{{ group.type.name }}</th> <th>{{ group.type.name }}</th>
<th>Name</th> <th>Name</th>
@ -19,13 +20,13 @@
</tr> </tr>
<tr> <tr>
<td class="plain"></td> <td></td>
<th>Acronym</th> <th>Acronym</th>
<td>{{ group.acronym }}</td> <td>{{ group.acronym }}</td>
</tr> </tr>
<tr> <tr>
<td class="plain"></td> <td></td>
{% if group.parent and group.parent.type_id == "area" %} {% if group.parent and group.parent.type_id == "area" %}
<th>{{ group.parent.type.name }}</th> <th>{{ group.parent.type.name }}</th>
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td> <td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
@ -35,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td class="plain"></td> <td></td>
<th>State</th> <th>State</th>
<td> <td>
{{ group.state.name }} {{ group.state.name }}
@ -47,7 +48,7 @@
{% if group.features.has_chartering_process %} {% if group.features.has_chartering_process %}
<tr> <tr>
<td class="plain"></td> <td></td>
<th>Charter</th> <th>Charter</th>
<td> <td>
{% if group.charter %} {% if group.charter %}
@ -67,7 +68,7 @@
{% with group.groupurl_set.all as urls %} {% with group.groupurl_set.all as urls %}
{% if urls %} {% if urls %}
<tr> <tr>
<td class="plain"></td> <td></td>
<th>More info</th> <th>More info</th>
<td> <td>
{% for url in urls %} {% for url in urls %}
@ -78,13 +79,13 @@
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</tbody> </tbody>
<tbody> <tbody class="meta">
{% for slug, label, roles in group.personnel %} {% for slug, label, roles in group.personnel %}
<tr> <tr>
{% if forloop.first %} {% if forloop.first %}
<th>Personnel</th> <th>Personnel</th>
{% else %} {% else %}
<td class="plain"></td> <td></td>
{% endif %} {% endif %}
<th>{{ label }}</th> <th>{{ label }}</th>
<td> <td>
@ -101,18 +102,18 @@
{% if group.list_email %} {% if group.list_email %}
<tbody> <tbody class="meta">
<tr> <tr>
<th>Mailing list</th> <th>Mailing list</th>
<th>Address</th><td>{{ group.list_email|urlize }}</td> <th>Address</th><td>{{ group.list_email|urlize }}</td>
</tr> </tr>
<tr><td class="plain"></td><th>To subscribe</th><td>{{ group.list_subscribe|urlize }}</td></tr> <tr><td></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> <tr><td></td><th>Archive</th><td>{{ group.list_archive|urlize }}</td></tr>
</tbody> </tbody>
{% endif %} {% endif %}
{% if group.state_id != "conclude" and group.type_id != "sdo" and group.type_id != "rfcedtyp" and group.type_id != "isoc" %} {% if group.state_id != "conclude" and group.type_id != "sdo" and group.type_id != "rfcedtyp" and group.type_id != "isoc" %}
<tbody> <tbody class="meta">
<tr> <tr>
<th>Jabber chat</th> <th>Jabber chat</th>
<th>Room address</th> <th>Room address</th>
@ -120,7 +121,7 @@
</tr> </tr>
<tr> <tr>
<td class="plain"></td> <td></td>
<th>Logs</th> <th>Logs</th>
<td><a href="https://jabber.ietf.org/logs/{{ group.acronym }}/">https://jabber.ietf.org/logs/{{ group.acronym }}/</a></td> <td><a href="https://jabber.ietf.org/logs/{{ group.acronym }}/">https://jabber.ietf.org/logs/{{ group.acronym }}/</a></td>
</tr> </tr>

7
static/css/ietf.css
View file

@ -392,7 +392,12 @@ footer {
*/ */
table tbody td.plain, table tbody th.plain { border-top: 0; } table tbody.meta th, table tbody.meta td { border-top: 0; }
table tbody.meta th:nth-child(2), table tbody.meta td:nth-child(2) {
text-align: right;
}
td.ad div { border-bottom: solid #ccc 1px; } td.ad div { border-bottom: solid #ccc 1px; }