Skip to content

Commit 8734193

Browse files
authored
feat: Style preformatted alert messages better (ietf-tools#5152)
* feat: Style preformatted alert messages better * Fix test
1 parent 1fb5bd7 commit 8734193

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

ietf/nomcom/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ def do_common_work(self,url,expected_form):
19731973
response = self.client.get(url)
19741974
self.assertEqual(response.status_code,200)
19751975
q=PyQuery(response.content)
1976-
text_bits = [x.xpath('./text()') for x in q('.alert-warning')]
1976+
text_bits = [x.xpath('.//text()') for x in q('.alert-warning')]
19771977
flat_text_bits = [item for sublist in text_bits for item in sublist]
19781978
self.assertTrue(any(['not yet' in y for y in flat_text_bits]))
19791979
self.assertEqual(bool(q('form:not(.navbar-form)')),expected_form)

ietf/static/css/ietf.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ pre {
9797
width: 60px;
9898
}
9999

100+
// Style preformatted alert messages better.
101+
.preformatted {
102+
white-space: pre-line;
103+
}
104+
100105
.leftmenu {
101106
width: 13em;
102107

ietf/templates/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@
105105
</div>
106106
</noscript>
107107
{% for message in messages %}
108-
<div class="alert {% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %} {% endif %} {% if message.extra_tags %} {{ message.extra_tags }}{% endif %} alert-dismissable fade show">
108+
<div class="alert {% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %} {% endif %} alert-dismissable fade show">
109109
<button type="button"
110110
class="btn-close float-end"
111111
data-bs-dismiss="alert"
112112
aria-label="Close"></button>
113-
{{ message.message }}
113+
<div{% if message.extra_tags %} class="{{ message.extra_tags }}"{% endif %}>{{ message.message }}</div>
114114
</div>
115115
{% endfor %}
116116
{% block content %}{{ content|safe }}{% endblock %}

0 commit comments

Comments
 (0)