From cb07aef61edbb6e6e510643289aeeaa525fbd5e9 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 19 Jul 2015 14:00:52 +0000 Subject: [PATCH] Reverted some look-and-feel changes that came in with recent document metadata html and python refactoring, undoing fixes related to issues #1659 and #1663. - Legacy-Id: 9817 --- ietf/templates/doc/document_charter.html | 26 +++---- .../doc/document_conflict_review.html | 20 ++--- ietf/templates/doc/document_draft.html | 77 +++++++++---------- .../templates/doc/document_status_change.html | 24 +++--- static/css/ietf.css | 5 +- 5 files changed, 76 insertions(+), 76 deletions(-) diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html index 8fab9e120..4c131542d 100644 --- a/ietf/templates/doc/document_charter.html +++ b/ietf/templates/doc/document_charter.html @@ -31,7 +31,7 @@ Document - + {% if doc.get_state_slug != "approved" %} Proposed charter {% else %} @@ -49,8 +49,8 @@ - - + + Title {% if not snapshot and can_manage %} @@ -60,15 +60,15 @@ {{ doc.title }} - - + + Last updated {{ doc.time|date:"Y-m-d" }} - - + + State {% if not snapshot and can_manage %} @@ -92,7 +92,7 @@ WG - State + State {{ group.state.name }} @@ -101,7 +101,7 @@ IESG - Responsible AD + Responsible AD {% if can_manage %} {% doc_edit_button "charter_edit_ad" name=doc.name %} @@ -113,8 +113,8 @@ {% if not snapshot and chartering %} - - + + Telechat date {% if can_manage %} @@ -135,8 +135,8 @@ {% endif %} - - + + Send notices to {% if can_manage %} diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 254575a33..456c3f73e 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -26,7 +26,7 @@ Document - + {% if doc.get_state_slug not in approved_states %} Proposed conflict review {% else %} @@ -46,15 +46,15 @@ - - + + Last updated {{ doc.time|date:"Y-m-d" }} - - + + State {% if not snapshot and user|has_role:"Area Director,Secretariat" %} @@ -70,7 +70,7 @@ 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,8 +82,8 @@ {% if not snapshot %} - - + + Telechat date {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} @@ -105,8 +105,8 @@ {% endif %} - - + + Send notices to {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 499669943..177b5bc0d 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -41,7 +41,7 @@ Document - Type + Type {% if doc.get_state_slug == "rfc" %} @@ -63,8 +63,8 @@ - - + + Last updated @@ -76,8 +76,8 @@ {% if replaces or can_edit_stream_info %} - - + + Replaces {% if can_edit_stream_info %} @@ -91,8 +91,8 @@ {% endif %} {% if replaced_by %} - - + + Replaced by @@ -101,8 +101,8 @@ {% endif %} - - + + Stream {% if can_change_stream %} @@ -115,8 +115,8 @@ {% if doc.get_state_slug != "rfc" %} - - + + Intended RFC status {% if can_edit or can_edit_stream_info %} @@ -129,8 +129,8 @@ {% endif %} - - + + Formats @@ -148,8 +148,8 @@ {% if conflict_reviews %} - - + + IETF conflict review {{ conflict_reviews|join:", "|urlize_ietf_docs }} @@ -161,7 +161,7 @@ Stream {% if doc.stream %} - + {% if doc.stream.slug != "legacy" %} {% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state @@ -187,15 +187,15 @@ {% endif %} {% else %} - Stream state + Stream state (No stream defined) {% endif %} {% if consensus %} - - + + Consensus {% if can_edit or can_edit_stream_info %} @@ -208,8 +208,8 @@ {% endif %} - - + + Document shepherd {% if can_edit_stream_info %} @@ -224,8 +224,8 @@ {% if shepherd_writeup or can_edit_shepherd_writeup %} - - + + Shepherd write-up {% if can_edit_shepherd_writeup %} @@ -247,8 +247,8 @@ {% endif %} {% 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 %} @@ -257,7 +257,7 @@ IESG - IESG state + IESG state {% if iesg_state and can_edit %} Edit @@ -268,8 +268,8 @@ - - + + Telechat date {% if can_edit %} @@ -294,8 +294,8 @@ - - + + Responsible AD {% if can_edit %} @@ -309,8 +309,8 @@ {% if iesg_state %} {% if doc.note or can_edit %} - - + + IESG note {% if can_edit %} @@ -324,8 +324,8 @@ {% endif %} {% endif %} - - + + Send notices to {% if can_edit_notify %} @@ -343,7 +343,7 @@ IANA - IANA review state + IANA review state {% if can_edit_iana_state %} Edit @@ -354,8 +354,8 @@ - - + + IANA action state {% if can_edit_iana_state %} @@ -370,11 +370,10 @@ {% endif %} - {% if rfc_editor_state %} RFC Editor - RFC Editor state + RFC Editor state {{ rfc_editor_state }} diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index 3817a5a11..c02cd876f 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -26,7 +26,7 @@ Document - + {% if doc.get_state_slug not in approved_states %} Proposed status change {% else %} @@ -46,8 +46,8 @@ - - + + Last updated {{ doc.time|date:"Y-m-d" }} @@ -56,16 +56,16 @@ {% regroup sorted_relations by relationship.name as relation_groups %} {% for relation_group in relation_groups %} - - + + {{relation_group.grouper}} {% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %} {% endfor %} - - + + State {% if not snapshot and user|has_role:"Area Director,Secretariat" %} @@ -81,7 +81,7 @@ 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,8 +101,8 @@ - - + + Shepherding AD {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} @@ -114,8 +114,8 @@ - - + + Send notices to {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} diff --git a/static/css/ietf.css b/static/css/ietf.css index a2e02148c..247fea1b5 100644 --- a/static/css/ietf.css +++ b/static/css/ietf.css @@ -391,8 +391,9 @@ footer { } */ - -table tbody td.plain, table tbody th.plain { border-top: 0; } +tbody tr.plain td, tbody tr.plain th { border-top: 0px; } +tbody tr.plain th { text-align: right; width: 9em; } +tbody tr.plain:first-child th { text-align: left; width: 6em; } td.ad div { border-bottom: solid #ccc 1px; }