From 69a3c5dea43cfc30f07e429bbb124ab5c2abea9b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 23 Jul 2015 09:55:56 +0000
Subject: [PATCH] Merged in [9856] from lars@netapp.com:

    Style the metadata tables for groups, documents, etc. like Henrik prefers.
 - Legacy-Id: 9867
Note: SVN reference [9856] has been migrated to Git commit 9133b9469e556081b6fb8c3ba24225944e4cdc27
---
 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                           | 13 ++++--
 6 files changed, 73 insertions(+), 65 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 2b4301c35..78df0162d 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 class="text-right">Type</th>
@@ -63,7 +63,7 @@
 	</td>
       </tr>
 
-      <tr class="plain">
+      <tr>
       	<th></th>
 	<th>Last updated</th>
 	<td class="edit"></td>
@@ -76,7 +76,7 @@
       </tr>
 
       {% if replaces or can_edit_stream_info %}
-	<tr class="plain">
+	<tr>
 	  <th></th>
 	  <th>Replaces</th>
 	  <td class="edit">
@@ -91,7 +91,7 @@
       {% endif %}
 
       {% if replaced_by %}
-	<tr class="plain">
+	<tr>
 	  <th></th>
 	  <th>Replaced by</th>
 	  <td class="edit"></td>
@@ -131,7 +131,7 @@
           {% endif %}
       {% endif %}
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>Stream</th>
 	<td class="edit">
@@ -145,7 +145,7 @@
       </tr>
 
       {% if doc.get_state_slug != "rfc" %}
-	<tr class="plain">
+	<tr>
 	  <th></th>
 	  <th>Intended RFC status</th>
 	  <td class="edit">
@@ -159,7 +159,7 @@
 	</tr>
       {% endif %}
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>Formats</th>
 	<td class="edit"></td>
@@ -178,7 +178,7 @@
       </tr>
 
       {% if conflict_reviews %}
-	<tr class="plain">
+	<tr>
           <th></th>
 	  <th>IETF conflict review</th>
 	  <td class="edit"></td>
@@ -187,7 +187,7 @@
       {% endif %}
 
     </tbody>
-    <tbody>
+    <tbody class="meta">
       <tr>
 	<th>Stream</th>
 	{% if doc.stream %}
@@ -224,7 +224,7 @@
       </tr>
 
       {% if consensus %}
-	<tr class="plain">
+	<tr>
 	  <th></th>
 	  <th>Consensus</th>
 	  <td class="edit">
@@ -238,7 +238,7 @@
 	</tr>
       {% endif %}
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>Document shepherd</th>
 	<td class="edit">
@@ -254,7 +254,7 @@
       </tr>
 
       {% if shepherd_writeup or can_edit_shepherd_writeup %}
-	<tr class="plain">
+	<tr>
 	  <th></th>
 	  <th>Shepherd write-up</th>
 	  <td class="edit">
@@ -277,14 +277,14 @@
       {% endif %}
 
       {% if published and started_iesg_process and published.time < started_iesg_process.time %}
-	<tr class="plain">
+	<tr>
 	  <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 class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
@@ -298,7 +298,7 @@
 	</td>
       </tr>
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>Telechat date</th>
 	<td class="edit">
@@ -324,7 +324,7 @@
 	</td>
       </tr>
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>Responsible AD</th>
 	<td class="edit">
@@ -339,7 +339,7 @@
 
       {% if iesg_state %}
 	{% if doc.note or can_edit %}
-	  <tr class="plain">
+	  <tr>
 	    <th></th>
 	    <th>IESG note</th>
 	    <td class="edit">
@@ -354,7 +354,7 @@
 	{% endif %}
       {% endif %}
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>Send notices to</th>
 	<td class="edit">
@@ -370,7 +370,7 @@
     </tbody>
 
     {% if iana_review_state %}
-    <tbody>
+    <tbody class="meta">
       <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>
@@ -384,7 +384,7 @@
 	</td>
       </tr>
 
-      <tr class="plain">
+      <tr>
         <th></th>
 	<th>IANA action state</th>
 	<td class="edit">
@@ -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 fb7b7f09d..0719233b9 100644
--- a/static/css/ietf.css
+++ b/static/css/ietf.css
@@ -391,9 +391,16 @@ footer {
 }
 */
 
-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; }
+
+table tbody.meta th, table tbody.meta td { border-top: 0; }
+table tbody.meta th:first-child, table tbody.meta td:first-child {
+	width: 6em;
+}
+table tbody.meta th:nth-child(2), table tbody.meta td:nth-child(2) {
+	text-align: right;
+	width: 9em;
+}
+
 
 td.ad div { border-bottom: solid #ccc 1px; }