Skip to content

Commit 955d9ac

Browse files
larseggertNGPixel
andauthored
fix: Spacing issues and colorization in conflict review display (ietf-tools#3882)
Co-authored-by: Nicolas Giard <github@ngpixel.com>
1 parent 0dec52f commit 955d9ac

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

ietf/templates/doc/document_conflict_review.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@
2828
<td class="edit"></td>
2929
<td>
3030
<a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.canonical_name %}">
31-
{% if conflictdoc.get_state_slug == 'rfc' %}
32-
{{ conflictdoc.canonical_name|upper }}
33-
{% else %}
34-
{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
35-
{% endif %}
36-
</a>
31+
{% if conflictdoc.get_state_slug == 'rfc' %}{{ conflictdoc.canonical_name|prettystdname }}{% else %}{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endif %}</a>
3732
<span class="badge bg-info">{{ conflictdoc.stream }} stream</span>
3833
{% if snapshot %}<span class="badge bg-warning">Snapshot</span>{% endif %}
3934
</td>
@@ -58,7 +53,13 @@
5853
</a>
5954
{% endif %}
6055
</td>
61-
<td>{{ doc.get_state.name }}</td>
56+
<td>
57+
{% if "no-problem" in doc.get_state.name|slugify %}
58+
<span class="text-success">{{ doc.get_state.name}}</span>
59+
{% else %}
60+
{{ doc.get_state.name }}
61+
{% endif %}
62+
</td>
6263
</tr>
6364
</tbody>
6465
<tbody class="meta border-top">
@@ -148,4 +149,4 @@
148149
</script>
149150
<script src="{% static 'ietf/js/document_timeline.js' %}">
150151
</script>
151-
{% endblock %}
152+
{% endblock %}

0 commit comments

Comments
 (0)