From 9133b9469e556081b6fb8c3ba24225944e4cdc27 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Wed, 22 Jul 2015 14:06:02 +0000 Subject: [PATCH] Style the metadata tables for groups, documents, etc. like Henrik prefers. Commit ready for merge. - Legacy-Id: 9856 --- ietf/templates/doc/document_charter.html | 22 +++++----- .../doc/document_conflict_review.html | 16 +++---- ietf/templates/doc/document_draft.html | 42 +++++++++---------- .../templates/doc/document_status_change.html | 18 ++++---- ietf/templates/group/group_about.html | 27 ++++++------ static/css/ietf.css | 7 +++- 6 files changed, 69 insertions(+), 63 deletions(-) diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html index 4c131542d..27b1378cc 100644 --- a/ietf/templates/doc/document_charter.html +++ b/ietf/templates/doc/document_charter.html @@ -27,11 +27,11 @@ - + Document - + {% if doc.get_state_slug != "approved" %} Proposed charter {% else %} @@ -49,7 +49,7 @@ - + Title @@ -60,14 +60,14 @@ {{ doc.title }} - + Last updated {{ doc.time|date:"Y-m-d" }} - + State @@ -89,19 +89,19 @@ - + WG - State + State {{ group.state.name }} - + IESG - Responsible AD + Responsible AD {% if can_manage %} {% doc_edit_button "charter_edit_ad" name=doc.name %} @@ -113,7 +113,7 @@ {% if not snapshot and chartering %} - + Telechat date @@ -135,7 +135,7 @@ {% endif %} - + Send notices to diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 456c3f73e..1dcb5ab9a 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -23,10 +23,10 @@ - + Document - + {% if doc.get_state_slug not in approved_states %} Proposed conflict review {% else %} @@ -46,14 +46,14 @@ - + Last updated {{ doc.time|date:"Y-m-d" }} - + State @@ -67,10 +67,10 @@ - + IESG - Shepherding AD + Shepherding AD {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} Edit @@ -82,7 +82,7 @@ {% if not snapshot %} - + Telechat date @@ -105,7 +105,7 @@ {% endif %} - + Send notices to diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 23caab284..5998e7ea7 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -38,7 +38,7 @@ - + Document Type @@ -64,7 +64,7 @@ - + Last updated @@ -77,7 +77,7 @@ {% if replaces or can_edit_stream_info %} - + Replaces {% if can_edit_stream_info %} @@ -92,7 +92,7 @@ {% if replaced_by %} - + Replaced by @@ -132,7 +132,7 @@ {% endif %} - + Stream {% if can_change_stream %} @@ -146,7 +146,7 @@ {% if doc.get_state_slug != "rfc" %} - + Intended RFC status {% if can_edit or can_edit_stream_info %} @@ -160,7 +160,7 @@ {% endif %} - + Formats @@ -179,7 +179,7 @@ {% if conflict_reviews %} - + IETF conflict review {{ conflict_reviews|join:", "|urlize_ietf_docs }} @@ -187,7 +187,7 @@ {% endif %} - + Stream {% if doc.stream %} @@ -225,7 +225,7 @@ {% if consensus %} - + Consensus {% if can_edit or can_edit_stream_info %} @@ -239,7 +239,7 @@ {% endif %} - + Document shepherd {% if can_edit_stream_info %} @@ -255,7 +255,7 @@ {% if shepherd_writeup or can_edit_shepherd_writeup %} - + Shepherd write-up {% if can_edit_shepherd_writeup %} @@ -278,13 +278,13 @@ {% if published and started_iesg_process and published.time < started_iesg_process.time %} - + This information refers to IESG processing after the RFC was initially published: {% endif %} - + IESG IESG state @@ -299,7 +299,7 @@ - + Telechat date {% if can_edit %} @@ -325,7 +325,7 @@ - + Responsible AD {% if can_edit %} @@ -340,7 +340,7 @@ {% if iesg_state %} {% if doc.note or can_edit %} - + IESG note {% if can_edit %} @@ -355,7 +355,7 @@ {% endif %} - + Send notices to {% if can_edit_notify %} @@ -370,7 +370,7 @@ {% if iana_review_state %} - + IANA IANA review state @@ -385,7 +385,7 @@ - + IANA action state {% if can_edit_iana_state %} @@ -399,7 +399,7 @@ {% endif %} - + {% if rfc_editor_state %} RFC Editor diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index c02cd876f..d6542332a 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -23,10 +23,10 @@ - + Document - + {% if doc.get_state_slug not in approved_states %} Proposed status change {% else %} @@ -46,7 +46,7 @@ - + Last updated @@ -56,7 +56,7 @@ {% regroup sorted_relations by relationship.name as relation_groups %} {% for relation_group in relation_groups %} - + {{relation_group.grouper}} @@ -64,7 +64,7 @@ {% endfor %} - + State @@ -78,10 +78,10 @@ - + IESG - Telechat date + Telechat date {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} Edit @@ -101,7 +101,7 @@ - + Shepherding AD @@ -114,7 +114,7 @@ - + Send notices to diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index dcbf15461..c3f4565ba 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -10,8 +10,9 @@

Note: The data for concluded {{ group.type.name }}s is occasionally incorrect.

{% endif %} +
- + @@ -19,13 +20,13 @@ - + - + {% if group.parent and group.parent.type_id == "area" %} @@ -35,7 +36,7 @@ - + - + - + - + {% for slug, label, roles in group.personnel %} {% if forloop.first %} {% else %} - + {% endif %} + - - + + {% endif %} {% if group.state_id != "conclude" and group.type_id != "sdo" and group.type_id != "rfcedtyp" and group.type_id != "isoc" %} - + @@ -120,7 +121,7 @@ - + diff --git a/static/css/ietf.css b/static/css/ietf.css index 262a5f479..e68b3e878 100644 --- a/static/css/ietf.css +++ b/static/css/ietf.css @@ -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; }
{{ group.type.name }} Name
Acronym {{ group.acronym }}
{{ group.parent.type.name }} {{ group.parent.name }} ({{ group.parent.acronym }})
State {{ group.state.name }} @@ -47,7 +48,7 @@ {% if group.features.has_chartering_process %}
Charter {% if group.charter %} @@ -67,7 +68,7 @@ {% with group.groupurl_set.all as urls %} {% if urls %}
More info {% for url in urls %} @@ -78,13 +79,13 @@ {% endif %} {% endwith %}
Personnel{{ label }} @@ -101,18 +102,18 @@ {% if group.list_email %} -
Mailing list Address{{ group.list_email|urlize }}
To subscribe{{ group.list_subscribe|urlize }}
Archive{{ group.list_archive|urlize }}
To subscribe{{ group.list_subscribe|urlize }}
Archive{{ group.list_archive|urlize }}
Jabber chat Room address
Logs https://jabber.ietf.org/logs/{{ group.acronym }}/