altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: Spacing issues and colorization in conflict review display (#3882)

Browse source 
Co-authored-by: Nicolas Giard <github@ngpixel.com>
This commit is contained in:
Lars Eggert 2022-04-26 20:24:33 +03:00 committed by GitHub
parent 0dec52f129
commit 955d9ac489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ietf/templates/doc/document_conflict_review.html
View file

@ -28,12 +28,7 @@
<td class="edit"></td>
<td>
<a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.canonical_name %}">
{% if conflictdoc.get_state_slug == 'rfc' %}
{{ conflictdoc.canonical_name|upper }}
{% else %}
{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
{% endif %}
</a>
{% if conflictdoc.get_state_slug == 'rfc' %}{{ conflictdoc.canonical_name|prettystdname }}{% else %}{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endif %}</a>
<span class="badge bg-info">{{ conflictdoc.stream }} stream</span>
{% if snapshot %}<span class="badge bg-warning">Snapshot</span>{% endif %}
</td>
@ -58,7 +53,13 @@
</a>
{% endif %}
</td>
<td>{{ doc.get_state.name }}</td>
<td>
{% if "no-problem" in doc.get_state.name|slugify %}
<span class="text-success">{{ doc.get_state.name}}</span>
{% else %}
{{ doc.get_state.name }}
{% endif %}
</td>
</tr>
</tbody>
<tbody class="meta border-top">
@ -148,4 +149,4 @@
</script>
<script src="{% static 'ietf/js/document_timeline.js' %}">
</script>
{% endblock %}
{% endblock %}