From 491e6a61ef38b21a31ce6161e8bca95bb831a4fb Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 22 Jul 2015 13:26:43 +0000
Subject: [PATCH 1/4] Make metadata table consistent with others. Commit ready
for merge. - Legacy-Id: 9854
---
ietf/templates/doc/document_draft.html | 76 +++++++++++++-------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 2b4301c35..23caab284 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -41,7 +41,7 @@
<tbody>
<tr>
<th>Document</th>
- <th class="text-right">Type</th>
+ <th>Type</th>
<td class="edit"></td>
<td>
{% if doc.get_state_slug == "rfc" %}
@@ -63,8 +63,8 @@
</td>
</tr>
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Last updated</th>
<td class="edit"></td>
<td>
@@ -76,8 +76,8 @@
</tr>
{% if replaces or can_edit_stream_info %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Replaces</th>
<td class="edit">
{% if can_edit_stream_info %}
@@ -91,8 +91,8 @@
{% endif %}
{% if replaced_by %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Replaced by</th>
<td class="edit"></td>
<td>
@@ -131,8 +131,8 @@
{% endif %}
{% endif %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Stream</th>
<td class="edit">
{% if can_change_stream %}
@@ -145,8 +145,8 @@
</tr>
{% if doc.get_state_slug != "rfc" %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Intended RFC status</th>
<td class="edit">
{% if can_edit or can_edit_stream_info %}
@@ -159,8 +159,8 @@
</tr>
{% endif %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Formats</th>
<td class="edit"></td>
<td>
@@ -178,8 +178,8 @@
</tr>
{% if conflict_reviews %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>IETF conflict review</th>
<td class="edit"></td>
<td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td>
@@ -191,7 +191,7 @@
<tr>
<th>Stream</th>
{% if doc.stream %}
- <th class="text-right">
+ <th>
{% if doc.stream.slug != "legacy" %}
<a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
{% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state
@@ -217,15 +217,15 @@
{% endif %}
</td>
{% else %}
- <th class="text-right">Stream state</th>
+ <th>Stream state</th>
<td class="edit"></td>
<td>(No stream defined)</td>
{% endif %}
</tr>
{% if consensus %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Consensus</th>
<td class="edit">
{% if can_edit or can_edit_stream_info %}
@@ -238,8 +238,8 @@
</tr>
{% endif %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Document shepherd</th>
<td class="edit">
{% if can_edit_stream_info %}
@@ -254,8 +254,8 @@
</tr>
{% if shepherd_writeup or can_edit_shepherd_writeup %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Shepherd write-up</th>
<td class="edit">
{% if can_edit_shepherd_writeup %}
@@ -277,8 +277,8 @@
{% endif %}
{% if published and started_iesg_process and published.time < started_iesg_process.time %}
- <tr class="plain">
- <th></th>
+ <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 %}
@@ -287,7 +287,7 @@
<tbody>
<tr>
<th>IESG</th>
- <th class="text-right"><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>
<td class="edit">
{% if iesg_state and can_edit %}
<a class="btn btn-default btn-xs" href="{% url "doc_change_state" name=doc.name %}">Edit</a>
@@ -298,8 +298,8 @@
</td>
</tr>
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Telechat date</th>
<td class="edit">
{% if can_edit %}
@@ -324,8 +324,8 @@
</td>
</tr>
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Responsible AD</th>
<td class="edit">
{% if can_edit %}
@@ -339,8 +339,8 @@
{% if iesg_state %}
{% if doc.note or can_edit %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>IESG note</th>
<td class="edit">
{% if can_edit %}
@@ -354,8 +354,8 @@
{% endif %}
{% endif %}
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>Send notices to</th>
<td class="edit">
{% if can_edit_notify %}
@@ -373,7 +373,7 @@
<tbody>
<tr>
<th>IANA</th>
- <th class="text-right"><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>
<td class="edit">
{% if can_edit_iana_state %}
<a class="btn btn-default btn-xs" href="{% url "doc_change_iana_state" name=doc.name state_type="iana-review" %}">Edit</a>
@@ -384,8 +384,8 @@
</td>
</tr>
- <tr class="plain">
- <th></th>
+ <tr>
+ <th class="plain"></th>
<th>IANA action state</th>
<td class="edit">
{% if can_edit_iana_state %}
@@ -403,7 +403,7 @@
{% if rfc_editor_state %}
<tr>
<th>RFC Editor</th>
- <th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></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>
</tr>
From 0293061c3f34e5bab6f43f099d7b7cfd5f227cac Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 22 Jul 2015 13:27:25 +0000
Subject: [PATCH 2/4] Fix bugs in adding/removing documents to personal ID
list.
Commit ready for merge.
- Legacy-Id: 9855
---
ietf/templates/doc/search/search_result_row.html | 4 ++--
ietf/templates/doc/search/search_results.html | 6 +-----
ietf/templates/iesg/agenda_documents.html | 7 +------
static/js/ietf.js | 10 +++++++---
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index f03ecfe3e..e0eb794a8 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -15,11 +15,11 @@
{% if user.is_authenticated %}
{% if doc.name in doc_is_tracked %}
<a href="{% url "community_remove_track_document" doc.name %}" class="community-list-add-remove-doc" title="Remove from your personal ID list">
- <span class="fa fa-bookmark-o"></span>
+ <span class="fa fa-bookmark"></span>
</a>
{% else %}
<a href="{% url "community_add_track_document" doc.name %}" class="community-list-add-remove-doc" title="Add to your personal ID list">
- <span class="fa fa-bookmark"></span>
+ <span class="fa fa-bookmark-o"></span>
</a>
{% endif %}
{% endif %}
diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html
index 9b0b8ffa1..10ca2759f 100644
--- a/ietf/templates/doc/search/search_results.html
+++ b/ietf/templates/doc/search/search_results.html
@@ -16,11 +16,7 @@
<table class="table table-condensed table-striped">
<thead>
<tr>
- <th>
- {% if show_add_to_list and user.is_authenticated %}
- <span class="fa fa-bookmark"></span>
- {% endif %}
- </th>
+ <th></th>
{% for h in meta.headers %}
{% if h.title != "Title" %}
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 23da5b85c..75ae473a4 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -45,12 +45,7 @@
<table class="table table-condensed table-striped ietf">
<thead>
<tr>
- <th>
- {% if show_add_to_list and user.is_authenticated %}
- <span class="fa fa-bookmark"></span>
- {% endif %}
- </th>
-
+ <th></th>
<th>Document</th>
<th>Date</th>
<th>Status</th>
diff --git a/static/js/ietf.js b/static/js/ietf.js
index 6e8583a7d..b40e1a24f 100644
--- a/static/js/ietf.js
+++ b/static/js/ietf.js
@@ -110,10 +110,14 @@ $(document).ready(function () {
dataType: 'json',
success: function(response){
if (response.success) {
- trigger.parent().find(".tooltip").remove();
- // it would be neater to swap in remove link
- trigger.replaceWith('<span class="fa fa-tag text-danger"></span>');
+ trigger.parent().find(".tooltip").remove();
+ trigger.find("span.fa").toggleClass("fa-bookmark fa-bookmark-o");
+ if (trigger.hasClass('btn')) {
+ trigger.attr('disabled', true).blur();
+ } else {
+ trigger.contents().unwrap().blur();
}
+ }
}
});
});
From 9133b9469e556081b6fb8c3ba24225944e4cdc27 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 22 Jul 2015 14:06:02 +0000
Subject: [PATCH 3/4] 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 @@
</tr>
</thead>
- <tbody>
+ <tbody class="meta">
<tr>
<th>Document</th>
- <th class="text-right">
+ <th>
{% if doc.get_state_slug != "approved" %}
Proposed charter
{% else %}
@@ -49,7 +49,7 @@
</td>
</tr>
- <tr class="plain">
+ <tr>
<td></td>
<th>Title</th>
<td class="edit">
@@ -60,14 +60,14 @@
<td>{{ doc.title }}</td>
</tr>
- <tr class="plain">
+ <tr>
<td></td>
<th>Last updated</th>
<td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td>
</tr>
- <tr class="plain">
+ <tr>
<td></td>
<th><a href="/doc/help/state/charter/">State</a></th>
<td class="edit">
@@ -89,19 +89,19 @@
</tbody>
- <tbody>
+ <tbody class="meta">
<tr>
<th>WG</th>
- <th class="text-right">State</th>
+ <th>State</th>
<td class="edit"></td>
<td>{{ group.state.name }}</td>
</tr>
</tbody>
- <tbody>
+ <tbody class="meta">
<tr>
<th>IESG</th>
- <th class="text-right">Responsible AD</th>
+ <th>Responsible AD</th>
<td class="edit">
{% if can_manage %}
{% doc_edit_button "charter_edit_ad" name=doc.name %}
@@ -113,7 +113,7 @@
</tr>
{% if not snapshot and chartering %}
- <tr class="plain">
+ <tr>
<td></td>
<th>Telechat date</th>
<td class="edit">
@@ -135,7 +135,7 @@
</tr>
{% endif %}
- <tr class="plain">
+ <tr>
<td></td>
<th>Send notices to</th>
<td class="edit">
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 @@
</tr>
</thead>
- <tbody>
+ <tbody class="meta">
<tr>
<th>Document</th>
- <th class="text-right">
+ <th>
{% if doc.get_state_slug not in approved_states %}
Proposed conflict review
{% else %}
@@ -46,14 +46,14 @@
</td>
</tr>
- <tr class="plain">
+ <tr>
<td></td>
<th>Last updated</th>
<td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td>
</tr>
- <tr class="plain">
+ <tr>
<td></td>
<th><a href="/doc/help/state/conflict-review/">State</a></th>
<td class="edit">
@@ -67,10 +67,10 @@
</tr>
</tbody>
- <tbody>
+ <tbody class="meta">
<tr>
<th>IESG</th>
- <th class="text-right">Shepherding AD</th>
+ <th>Shepherding AD</th>
<td class="edit">
{% 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>
@@ -82,7 +82,7 @@
</tr>
{% if not snapshot %}
- <tr class="plain">
+ <tr>
<td></td>
<th>Telechat date</th>
<td class="edit">
@@ -105,7 +105,7 @@
</tr>
{% endif %}
- <tr class="plain">
+ <tr>
<td></td>
<th>Send notices to</th>
<td class="edit">
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 @@
</tr>
</thead>
- <tbody>
+ <tbody class="meta">
<tr>
<th>Document</th>
<th>Type</th>
@@ -64,7 +64,7 @@
</tr>
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Last updated</th>
<td class="edit"></td>
<td>
@@ -77,7 +77,7 @@
{% if replaces or can_edit_stream_info %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Replaces</th>
<td class="edit">
{% if can_edit_stream_info %}
@@ -92,7 +92,7 @@
{% if replaced_by %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Replaced by</th>
<td class="edit"></td>
<td>
@@ -132,7 +132,7 @@
{% endif %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Stream</th>
<td class="edit">
{% if can_change_stream %}
@@ -146,7 +146,7 @@
{% if doc.get_state_slug != "rfc" %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Intended RFC status</th>
<td class="edit">
{% if can_edit or can_edit_stream_info %}
@@ -160,7 +160,7 @@
{% endif %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Formats</th>
<td class="edit"></td>
<td>
@@ -179,7 +179,7 @@
{% if conflict_reviews %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>IETF conflict review</th>
<td class="edit"></td>
<td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td>
@@ -187,7 +187,7 @@
{% endif %}
</tbody>
- <tbody>
+ <tbody class="meta">
<tr>
<th>Stream</th>
{% if doc.stream %}
@@ -225,7 +225,7 @@
{% if consensus %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Consensus</th>
<td class="edit">
{% if can_edit or can_edit_stream_info %}
@@ -239,7 +239,7 @@
{% endif %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Document shepherd</th>
<td class="edit">
{% if can_edit_stream_info %}
@@ -255,7 +255,7 @@
{% if shepherd_writeup or can_edit_shepherd_writeup %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Shepherd write-up</th>
<td class="edit">
{% if can_edit_shepherd_writeup %}
@@ -278,13 +278,13 @@
{% if published and started_iesg_process and published.time < started_iesg_process.time %}
<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>
</tr>
{% endif %}
</tbody>
- <tbody>
+ <tbody class="meta">
<tr>
<th>IESG</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>
- <th class="plain"></th>
+ <th></th>
<th>Telechat date</th>
<td class="edit">
{% if can_edit %}
@@ -325,7 +325,7 @@
</tr>
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Responsible AD</th>
<td class="edit">
{% if can_edit %}
@@ -340,7 +340,7 @@
{% if iesg_state %}
{% if doc.note or can_edit %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>IESG note</th>
<td class="edit">
{% if can_edit %}
@@ -355,7 +355,7 @@
{% endif %}
<tr>
- <th class="plain"></th>
+ <th></th>
<th>Send notices to</th>
<td class="edit">
{% if can_edit_notify %}
@@ -370,7 +370,7 @@
</tbody>
{% if iana_review_state %}
- <tbody>
+ <tbody class="meta">
<tr>
<th>IANA</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>
- <th class="plain"></th>
+ <th></th>
<th>IANA action state</th>
<td class="edit">
{% if can_edit_iana_state %}
@@ -399,7 +399,7 @@
</tbody>
{% endif %}
- <tbody>
+ <tbody class="meta">
{% if rfc_editor_state %}
<tr>
<th>RFC Editor</th>
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 @@
</tr>
</thead>
- <tbody>
+ <tbody class="meta">
<tr>
<th>Document</th>
- <th class="text-right">
+ <th>
{% if doc.get_state_slug not in approved_states %}
Proposed status change
{% else %}
@@ -46,7 +46,7 @@
</td>
</tr>
- <tr class="plain">
+ <tr>
<th></th>
<th>Last updated</th>
<td class="edit"></td>
@@ -56,7 +56,7 @@
{% regroup sorted_relations by relationship.name as relation_groups %}
{% for relation_group in relation_groups %}
- <tr class="plain">
+ <tr>
<th></th>
<th>{{relation_group.grouper}}</th>
<td class="edit"></td>
@@ -64,7 +64,7 @@
</tr>
{% endfor %}
- <tr class="plain">
+ <tr>
<th></th>
<th><a href="{% url "state_help" type="status-change" %}">State</a></th>
<td class="edit">
@@ -78,10 +78,10 @@
</tr>
</tbody>
- <tbody>
+ <tbody class="meta">
<tr>
<th>IESG</th>
- <th class="text-right">Telechat date</th>
+ <th>Telechat date</th>
<td class="edit">
{% 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>
@@ -101,7 +101,7 @@
</td>
</tr>
- <tr class="plain">
+ <tr>
<th></th>
<th>Shepherding AD</th>
<td class="edit">
@@ -114,7 +114,7 @@
</td>
</tr>
- <tr class="plain">
+ <tr>
<th></th>
<th>Send notices to</th>
<td class="edit">
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 @@
<p class="alert alert-warning"><b>Note:</b> The data for concluded {{ group.type.name }}s is occasionally incorrect.</p>
{% endif %}
+ <br>
<table class="table table-condensed">
- <tbody>
+ <tbody class="meta">
<tr>
<th>{{ group.type.name }}</th>
<th>Name</th>
@@ -19,13 +20,13 @@
</tr>
<tr>
- <td class="plain"></td>
+ <td></td>
<th>Acronym</th>
<td>{{ group.acronym }}</td>
</tr>
<tr>
- <td class="plain"></td>
+ <td></td>
{% if group.parent and group.parent.type_id == "area" %}
<th>{{ group.parent.type.name }}</th>
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
@@ -35,7 +36,7 @@
</tr>
<tr>
- <td class="plain"></td>
+ <td></td>
<th>State</th>
<td>
{{ group.state.name }}
@@ -47,7 +48,7 @@
{% if group.features.has_chartering_process %}
<tr>
- <td class="plain"></td>
+ <td></td>
<th>Charter</th>
<td>
{% if group.charter %}
@@ -67,7 +68,7 @@
{% with group.groupurl_set.all as urls %}
{% if urls %}
<tr>
- <td class="plain"></td>
+ <td></td>
<th>More info</th>
<td>
{% for url in urls %}
@@ -78,13 +79,13 @@
{% endif %}
{% endwith %}
</tbody>
- <tbody>
+ <tbody class="meta">
{% for slug, label, roles in group.personnel %}
<tr>
{% if forloop.first %}
<th>Personnel</th>
{% else %}
- <td class="plain"></td>
+ <td></td>
{% endif %}
<th>{{ label }}</th>
<td>
@@ -101,18 +102,18 @@
{% if group.list_email %}
- <tbody>
+ <tbody class="meta">
<tr>
<th>Mailing list</th>
<th>Address</th><td>{{ group.list_email|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>
+ <tr><td></td><th>To subscribe</th><td>{{ group.list_subscribe|urlize }}</td></tr>
+ <tr><td></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>
+ <tbody class="meta">
<tr>
<th>Jabber chat</th>
<th>Room address</th>
@@ -120,7 +121,7 @@
</tr>
<tr>
- <td class="plain"></td>
+ <td></td>
<th>Logs</th>
<td><a href="https://jabber.ietf.org/logs/{{ group.acronym }}/">https://jabber.ietf.org/logs/{{ group.acronym }}/</a></td>
</tr>
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; }
From dcccd9c863702346160cca3ce444ca21ac575f24 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 22 Jul 2015 14:31:01 +0000
Subject: [PATCH 4/4] Apply more of the styling from the current meta tables.
Commit ready for merge. - Legacy-Id: 9857
---
ietf/templates/doc/document_charter.html | 4 ++--
ietf/templates/doc/document_draft.html | 4 ++--
ietf/templates/group/group_about.html | 2 +-
static/css/ietf.css | 5 +++++
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 27b1378cc..c8b760a3b 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -20,9 +20,9 @@
<thead id="message-row">
<tr>
{% if doc.rev != latest_rev %}
- <th colspan="4" class="alert-warning"> The information below is for an old version of the document</th>
+ <th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
{% else %}
- <th colspan="4"> </th>
+ <th colspan="4"></th>
{% endif %}
</tr>
</thead>
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 5998e7ea7..28c6a4631 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -31,9 +31,9 @@
<thead id="message-row">
<tr>
{% if doc.rev != latest_rev %}
- <th colspan="4" class="alert-warning"> The information below is for an old version of the document</th>
+ <th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
{% else %}
- <th colspan="4"> </th>
+ <th colspan="4"></th>
{% endif %}
</tr>
</thead>
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index c3f4565ba..567543b88 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -10,8 +10,8 @@
<p class="alert alert-warning"><b>Note:</b> The data for concluded {{ group.type.name }}s is occasionally incorrect.</p>
{% endif %}
- <br>
<table class="table table-condensed">
+ <thead><tr><th colspan="3"></th></tr></thead>
<tbody class="meta">
<tr>
<th>{{ group.type.name }}</th>
diff --git a/static/css/ietf.css b/static/css/ietf.css
index e68b3e878..7c05cd58f 100644
--- a/static/css/ietf.css
+++ b/static/css/ietf.css
@@ -396,6 +396,11 @@ 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;
+ width: 9em;
+}
+
+table tbody.meta th:first-child, table tbody.meta td:first-child {
+ width: 6em;
}