Skip to content

Commit 1f4f9cc

Browse files
committed
Merged in [10685] from lars@netapp.com:
Commit r10578 broke search result table display due to the added column. Fix this. (Also update vnu.jar. Unrelated, but wasn't careful when committing.) - Legacy-Id: 10689 Note: SVN reference [10685] has been migrated to Git commit 820d406
1 parent 41c47b3 commit 1f4f9cc

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

bin/vnu.jar

227 KB
Binary file not shown.

ietf/templates/doc/search/search_result_row.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@
9797
{% with doc|ballotposition:user as pos %}
9898
<td {% if pos %}class="changebar position-{{pos.slug}}"{% endif %}></td>
9999
{% endwith %}
100-
{% else %}
101-
<td></td>
102100
{% endif %}
103101

104102
</tr>

ietf/templates/doc/search/search_results.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
</th>
3535
{% endif %}
3636
{% endfor %}
37+
38+
{% if color_row_positions %}
39+
<th class="sorter-false"></th>
40+
{% endif %}
3741
</tr>
3842
</thead>
3943

@@ -43,7 +47,11 @@
4347
<tbody>
4448
<tr class="info">
4549
<th></th>
46-
<th colspan="{{ meta.headers|length|add:"-1" }}">
50+
{% if color_row_positions %}
51+
<th colspan="{{ meta.headers|length }}">
52+
{% else %}
53+
<th colspan="{{ meta.headers|length|add:"-1" }}">
54+
{% endif %}
4755
{{ doc_group.grouper|plural:doc_group.list }}
4856
</th>
4957
</tr>

0 commit comments

Comments
 (0)