Skip to content

Commit 6fa5fa0

Browse files
larseggertlarseggert
committed
More fixes.
 - Legacy-Id: 19812
1 parent 46ca676 commit 6fa5fa0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+545
-484
lines changed

‎ietf/doc/tests_ballot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ def test_issue_ballot_auto_state_change(self):
501501
self.assertEqual(r.status_code, 200)
502502
q = PyQuery(r.content)
503503
self.assertEqual(len(q('textarea[name=ballot_writeup]')), 1)
504-
self.assertFalse(q('[class=help-block]:contains("not completed IETF Last Call")'))
504+
self.assertFalse(q('[class=form-text]:contains("not completed IETF Last Call")'))
505505
self.assertTrue(q('[type=submit]:contains("Save")'))
506506
self.assertCountEqual(draft.action_holders.all(), [])
507507

@@ -525,7 +525,7 @@ def test_issue_ballot_warn_if_early(self):
525525
self.assertEqual(r.status_code, 200)
526526
q = PyQuery(r.content)
527527
self.assertEqual(len(q('textarea[name=ballot_writeup]')), 1)
528-
self.assertTrue(q('[class=help-block]:contains("not completed IETF Last Call")'))
528+
self.assertTrue(q('[class=text-danger]:contains("not completed IETF Last Call")'))
529529
self.assertTrue(q('[type=submit]:contains("Save")'))
530530

531531
def test_edit_approval_text(self):

‎ietf/static/js/status-change-edit-relations.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(function () {
1111
form.on("keydown", ".new-relation-row input[type=text]", function () {
1212
var top = $(this).closest(".new-relation-row");
1313
top.removeClass("new-relation-row");
14-
top.find(".help-block").remove();
14+
top.find(".form-text").remove();
1515
top.find(".delete").show();
1616
top.find("input,select").each(function () {
1717
this.name += counter;

‎ietf/submit/tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2652,7 +2652,7 @@ def do_submission(self, name, rev, group=None, formats=["txt",]):
26522652
r = self.client.post(url, files)
26532653
if r.status_code != 302:
26542654
q = PyQuery(r.content)
2655-
print(q('div.invalid-feedback span.help-block div').text())
2655+
print(q('div.invalid-feedback span.form-text div').text())
26562656

26572657
self.assertEqual(r.status_code, 302)
26582658

‎ietf/templates/403.html‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1+
{# bs5ok #}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
23
{% extends "base.html" %}
34
{% load static %}
45
{% block title %}404 Not Found{% endblock %}
56
{% block content %}
6-
7-
<img class="ietflogo" src="{% static 'ietf/images/ietflogo.png' %}" alt="IETF" style="width: 10em">
7+
<img class="ietflogo"
8+
src="{% static 'ietf/images/ietflogo.png' %}"
9+
alt="IETF"
10+
style="width: 10em">
811
<div class='alert'>
9-
1012
<h2>Restricted Access.</h2>
11-
12-
<p>{{ exception }}</p>
13-
14-
<p>If you think this is a server error, please contact <a href="mailto:{{ bugreport_email }}">{{ bugreport_email }}</a>.</p>
15-
13+
<p>
14+
{{ exception }}
15+
</p>
16+
<p>
17+
If you think this is a server error, please contact
18+
<a href="mailto:{{ bugreport_email }}">{{ bugreport_email }}</a>
19+
.
20+
</p>
1621
</div>
17-
{% endblock %}
18-
22+
{% endblock %}

‎ietf/templates/404.html‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1+
{# bs5ok #}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
23
{% extends "base.html" %}
34
{% load static %}
45
{% block title %}404 Not Found{% endblock %}
56
{% block content %}
6-
7-
<img class="ietflogo" src="{% static 'ietf/images/ietflogo.png' %}" alt="IETF" style="width: 10em">
7+
<img class="ietflogo"
8+
src="{% static 'ietf/images/ietflogo.png' %}"
9+
alt="IETF"
10+
style="width: 10em">
811
<div class='alert'>
9-
1012
<h2>The page you were looking for couldn't be found.</h2>
11-
12-
13-
<p> The requested URL was not found on this server. If you entered the URL
14-
manually please check your spelling and try again.</p>
15-
16-
<p>If you think this is a server error, please contact <a href="mailto:{{ bugreport_email }}">{{ bugreport_email }}</a>.</p>
17-
13+
<p>
14+
The requested URL was not found on this server. If you entered the URL
15+
manually please check your spelling and try again.
16+
</p>
17+
<p>
18+
If you think this is a server error, please contact
19+
<a href="mailto:{{ bugreport_email }}">{{ bugreport_email }}</a>
20+
.
21+
</p>
1822
</div>
19-
{% endblock %}
20-
23+
{% endblock %}

‎ietf/templates/500.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
{# bs5ok #}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
23
{% extends "base.html" %}
34
{% load static %}
45
{% block title %}500 Internal Server Error{% endblock %}
56
{% block content %}
6-
7-
<img class="ietflogo" src="{% static 'ietf/images/ietflogo.png' %}" alt="IETF" style="width: 10em">
8-
7+
<img class="ietflogo"
8+
src="{% static 'ietf/images/ietflogo.png' %}"
9+
alt="IETF"
10+
style="width: 10em">
911
<h2>Internal Server Error.</h2>
10-
1112
<p class="error-text">
1213
The server encountered an internal error and was unable to complete
1314
your request. Either the server is overloaded or there was an
@@ -19,7 +20,7 @@ <h2>Internal Server Error.</h2>
1920
A failure report with details about what happened has been sent to the
2021
server administrators. It would be helpful if you would file a bug
2122
report with additional information at the
22-
<a href="https://trac.ietf.org/trac/ietfdb/newticket">IETF database issue tracker</a>, too.
23+
<a href="https://trac.ietf.org/trac/ietfdb/newticket">IETF database issue tracker</a>
24+
, too.
2325
</p>
24-
25-
{% endblock %}
26+
{% endblock %}

‎ietf/templates/admin/group/group/change_form.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{# bs5ok #}
12
{% extends "admin/change_form.html" %}
23
{# Copyright The IETF Trust 2015, All Rights Reserved #}
34
{% load origin %}
@@ -14,4 +15,4 @@
1415
{% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
1516
</ul>
1617
{% endif %}{% endif %}
17-
{% endblock %}
18+
{% endblock %}

‎ietf/templates/admin/group/group/change_list.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{# bs5ok #}
12
{% extends "admin/change_list.html" %}
23
{# Copyright The IETF Trust 2015, All Rights Reserved #}
34
{% load origin %}
@@ -16,4 +17,4 @@
1617
</li>
1718
</ul>
1819
{% endif %}
19-
{% endblock %}
20+
{% endblock %}

‎ietf/templates/admin/group/group/send_sdo_reminder.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{# bs5ok #}
12
{% extends "admin/base_site.html" %}
23
{# Copyright The IETF Trust 2015, All Rights Reserved #}
34
{% load origin %}
@@ -43,4 +44,4 @@ <h1>Send a reminder to {% if sdo %}{{ sdo }} SDO Liaison Manager{% else %}all SD
4344
</form>
4445
{% endif %}
4546
</div>
46-
{% endblock %}
47+
{% endblock %}

‎ietf/templates/base.html‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{# bs5ok #}
12
{# Copyright The IETF Trust 2015-2021, All Rights Reserved #}
23
<!doctype html>
34
{% load ietf_filters static %}
@@ -37,18 +38,7 @@
3738
</head>
3839
<body class="position-relative"
3940
data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
40-
<nav class="navbar navbar-expand-lg
41-
{% if server_mode and server_mode != "production" %}
42-
navbar-light bg-warning
43-
{% else %}
44-
navbar-dark bg-secondary
45-
{% endif %}
46-
47-
{% if navbar_mode %}
48-
{{ navbar_mode }}
49-
{% else %}
50-
fixed-top
51-
{% endif %}">
41+
<nav class="navbar navbar-expand-lg {% if server_mode and server_mode != "production" %} navbar-light bg-warning {% else %} navbar-dark bg-secondary {% endif %} {% if navbar_mode %} {{ navbar_mode }} {% else %} fixed-top {% endif %}">
5242
<div class="container-fluid">
5343
<a class="navbar-brand" href="/">
5444
<img alt="IETF Logo"
@@ -62,12 +52,7 @@
6252
</ul>
6353
</div>
6454
{% if not user.is_authenticated %}
65-
<a class="d-none d-sm-block mx-5 btn
66-
{% if server_mode and server_mode == "production" %}
67-
btn-warning
68-
{% else %}
69-
btn-info
70-
{% endif %}"
55+
<a class="d-none d-sm-block mx-5 btn {% if server_mode and server_mode == "production" %} btn-warning {% else %} btn-info {% endif %}"
7156
rel="nofollow"
7257
href="/accounts/login/?next={{ request.get_full_path|urlencode }}">
7358
Sign
@@ -105,13 +90,7 @@
10590
{% endif %}
10691
<div class="col overflow-hidden mx-3" id="content">
10792
{% for message in messages %}
108-
<div class="alert
109-
{% if message.level_tag %}
110-
alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %}
111-
{% endif %}
112-
{% if message.extra_tags %}
113-
{{ message.extra_tags }}
114-
{% endif %} alert-dismissable fade show">
93+
<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">
11594
<button type="button"
11695
class="btn-close float-end"
11796
data-bs-dismiss="alert"
@@ -159,11 +138,12 @@
159138
<br />
160139
{% if python_version %}Python {{ python_version }}{% endif %}
161140
{% if django_version %}Django {{ django_version }}{% endif %}
141+
<br>
142+
{% include "debug.html" %}
162143
</p>
163144
</footer>
164145
{% endblock footer %}
165146
</div>
166-
{% include "debug.html" %}
167147
{% block js %}
168148
{% endblock js %}
169149
{% if debug %}

0 commit comments

Comments
 (0)