Fixed a wrong row count for stream meta-info when displaying RFCs. Also fixed a 'missing columns' html warning. Fixes issue ietf-tools#1697.

 - Legacy-Id: 9613

Author: levkowetz

ietf/doc/views_doc.py

@@ -352,10 +352,10 @@ def document_main(request, name, rev=None):
         # group label.  This would be easy if all browsers supported the rowspan="0" (zero)
         # semantics of the html standard, but only Firefox and Opera do, so we have to count
         # how many entries there will be in each section here, instead.  Bah!
-        table_rows = dict(doc=5, stream=3, iesg=5, iana=3, rfced=2)
+        table_rows = dict(doc=4, stream=2, iesg=4, iana=2, rfced=1)
         table_rows['doc'] += 1 if replaces or can_edit_stream_info else 0
         table_rows['doc'] += 1 if replaced_by  else 0
-        table_rows['doc'] += 1 if doc.get_state_slug != "rfc" else 0
+        table_rows['doc'] += 1 if doc.get_state_slug() != "rfc" else 0
         table_rows['doc'] += 1 if conflict_reviews else 0
 
         table_rows['stream'] += 1 if consensus else 0

ietf/templates/doc/document_draft.html

@@ -36,10 +36,7 @@
 
     <tbody class="plain">
       <tr>
-	 <th rowspan="{{table_rows.doc}}">Document</th>
-      </tr>
-
-      <tr>
+	<th rowspan="{{table_rows.doc}}">Document</th>
 	<th>Type</th>
 	<td class="edit"></td>
 	<td>
@@ -150,12 +147,8 @@
 
     </tbody>
     <tbody class="plain">
-
-      <tr>
-	 <th rowspan="{{table_rows.stream}}">Stream</th>
-      </tr>
-	 
       <tr>
+	<th rowspan="{{table_rows.stream}}">Stream</th>
 	{% if doc.stream %}
 	  <th>
 	     {% if doc.stream.slug != "legacy" %}
@@ -247,12 +240,8 @@
 
     </tbody>
     <tbody class="plain">
-
-      <tr>
-	 <th rowspan="{{table_rows.iesg}}">IESG</th>
-      </tr>
-
       <tr>
+	<th rowspan="{{table_rows.iesg}}">IESG</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 %}
@@ -334,10 +323,7 @@
     {% if iana_review_state %}
     <tbody class="plain">
       <tr>
-	 <th rowspan="{{table_rows.iana}}">IANA</th>
-      </tr>
-
-      <tr>
+	<th rowspan="{{table_rows.iana}}">IANA</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 %}
@@ -367,10 +353,7 @@
 
       {% if rfc_editor_state %}
 	<tr>
-	   <th rowspan="{{table_rows.rfced}}">RFC Editor</th>
-	</tr>
-
-	<tr>
+	  <th rowspan="{{table_rows.rfced}}">RFC Editor</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>