Skip to content

Commit bb5810a

Browse files
larseggertlarseggert
committed
Labels are badges in bs5.
 - Legacy-Id: 19616
1 parent eddc03c commit bb5810a

43 files changed

Lines changed: 122 additions & 124 deletions

Some content is hidden

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

‎ietf/doc/templatetags/ballot_icon.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ def state_age_colored(doc):
204204
goal1 = 14
205205
goal2 = 28
206206
if days > goal2:
207-
class_name = "label label-danger"
207+
class_name = "badge bg-danger"
208208
elif days > goal1:
209-
class_name = "label label-warning"
209+
class_name = "badge bg-warning"
210210
else:
211211
class_name = "ietf-small"
212212
if days > goal1:
@@ -231,6 +231,6 @@ def auth48_alert_badge(doc):
231231

232232
rfced_state = doc.get_state_slug('draft-rfceditor')
233233
if rfced_state == 'auth48':
234-
return mark_safe('<span class="label label-info" title="AUTH48">AUTH48</span>')
234+
return mark_safe('<span class="badge bg-info" title="AUTH48">AUTH48</span>')
235235

236236
return ''

‎ietf/doc/templatetags/ietf_filters.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,17 +614,17 @@ def action_holder_badge(action_holder):
614614
''
615615
616616
>>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=16)))
617-
'<span class="label label-danger" title="Goal is &lt;15 days">for 16 days</span>'
617+
'<span class="badge bg-danger" title="Goal is &lt;15 days">for 16 days</span>'
618618
619619
>>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=30)))
620-
'<span class="label label-danger" title="Goal is &lt;15 days">for 30 days</span>'
620+
'<span class="badge bg-danger" title="Goal is &lt;15 days">for 30 days</span>'
621621
622622
>>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit
623623
"""
624624
age_limit = settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS
625625
age = (datetime.datetime.now() - action_holder.time_added).days
626626
if age > age_limit:
627-
return mark_safe('<span class="label label-danger" title="Goal is &lt;%d days">for %d day%s</span>' % (
627+
return mark_safe('<span class="badge bg-danger" title="Goal is &lt;%d days">for %d day%s</span>' % (
628628
age_limit,
629629
age,
630630
's' if age != 1 else ''))

‎ietf/doc/views_review.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,11 +577,11 @@ def __init__(self, assignment, doc, team, is_reviewer, *args, **kwargs):
577577
kwargs["initial"]["reviewed_rev"] = last_version
578578

579579
self.fields["reviewed_rev"].help_text = mark_safe(
580-
" ".join("<a class=\"rev label label-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format(reviewed_rev_class[i], *r)
580+
" ".join("<a class=\"rev badge bg-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format(reviewed_rev_class[i], *r)
581581
for i, r in enumerate(known_revisions)))
582582
else:
583583
self.fields["reviewed_rev"].help_text = mark_safe(
584-
" ".join("<a class=\"rev label label-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format('', *r)
584+
" ".join("<a class=\"rev badge bg-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format('', *r)
585585
for i, r in enumerate(known_revisions)))
586586

587587
self.fields["result"].queryset = self.fields["result"].queryset.filter(reviewteamsettings_review_results_set__group=team)

‎ietf/group/tests_info.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,13 @@ def test_nonactive_group_badges(self):
448448
r = self.client.get(url)
449449
self.assertEqual(r.status_code,200)
450450
q = PyQuery(r.content)
451-
self.assertEqual(q('.label-warning').text(),"Concluded WG")
451+
self.assertEqual(q('.bg-warning').text(),"Concluded WG")
452452
replaced_group = GroupFactory(state_id='replaced')
453453
url = urlreverse("ietf.group.views.history",kwargs={'acronym':replaced_group.acronym})
454454
r = self.client.get(url)
455455
self.assertEqual(r.status_code,200)
456456
q = PyQuery(r.content)
457-
self.assertEqual(q('.label-warning').text(),"Replaced WG")
457+
self.assertEqual(q('.bg-warning').text(),"Replaced WG")
458458

459459

460460
class GroupEditTests(TestCase):
@@ -1847,5 +1847,4 @@ def test_groupform_acronym_validation(self):
18471847

18481848
wg = GroupFactory(acronym='bad-idea', type_id='wg')
18491849
form = GroupForm({'acronym':wg.acronym,'name':wg.name,'state':wg.state_id},group=wg, group_type=wg.type_id)
1850-
self.assertTrue(form.is_valid())
1851-
1850+
self.assertTrue(form.is_valid())

‎ietf/nomcom/tests.py‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ def test_feedback_index_badges(self):
13541354
response = self.client.get(url)
13551355
self.assertEqual(response.status_code,200)
13561356
q = PyQuery(response.content)
1357-
self.assertEqual( len(q('.label-success')), 4 )
1357+
self.assertEqual( len(q('.bg-success')), 4 )
13581358

13591359
f = self.nc.feedback_set.first()
13601360
f.time = self.hour_ago
@@ -1364,20 +1364,20 @@ def test_feedback_index_badges(self):
13641364
response = self.client.get(url)
13651365
self.assertEqual(response.status_code,200)
13661366
q = PyQuery(response.content)
1367-
self.assertEqual( len(q('.label-success')), 3 )
1367+
self.assertEqual( len(q('.bg-success')), 3 )
13681368

13691369
FeedbackLastSeen.objects.update(time=self.second_from_now)
13701370
response = self.client.get(url)
13711371
self.assertEqual(response.status_code,200)
13721372
q = PyQuery(response.content)
1373-
self.assertEqual( len(q('.label-success')), 1 )
1373+
self.assertEqual( len(q('.bg-success')), 1 )
13741374

13751375
TopicFeedbackLastSeen.objects.create(reviewer=self.member,topic=self.topic)
13761376
TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
13771377
response = self.client.get(url)
13781378
self.assertEqual(response.status_code,200)
13791379
q = PyQuery(response.content)
1380-
self.assertEqual( len(q('.label-success')), 0 )
1380+
self.assertEqual( len(q('.bg-success')), 0 )
13811381

13821382
def test_feedback_nominee_badges(self):
13831383
url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
@@ -1386,7 +1386,7 @@ def test_feedback_nominee_badges(self):
13861386
response = self.client.get(url)
13871387
self.assertEqual(response.status_code,200)
13881388
q = PyQuery(response.content)
1389-
self.assertEqual( len(q('.label-success')), 3 )
1389+
self.assertEqual( len(q('.bg-success')), 3 )
13901390

13911391
f = self.nc.feedback_set.first()
13921392
f.time = self.hour_ago
@@ -1396,13 +1396,13 @@ def test_feedback_nominee_badges(self):
13961396
response = self.client.get(url)
13971397
self.assertEqual(response.status_code,200)
13981398
q = PyQuery(response.content)
1399-
self.assertEqual( len(q('.label-success')), 2 )
1399+
self.assertEqual( len(q('.bg-success')), 2 )
14001400

14011401
FeedbackLastSeen.objects.update(time=self.second_from_now)
14021402
response = self.client.get(url)
14031403
self.assertEqual(response.status_code,200)
14041404
q = PyQuery(response.content)
1405-
self.assertEqual( len(q('.label-success')), 0 )
1405+
self.assertEqual( len(q('.bg-success')), 0 )
14061406

14071407
def test_feedback_topic_badges(self):
14081408
url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id})
@@ -1411,7 +1411,7 @@ def test_feedback_topic_badges(self):
14111411
response = self.client.get(url)
14121412
self.assertEqual(response.status_code,200)
14131413
q = PyQuery(response.content)
1414-
self.assertEqual( len(q('.label-success')), 1 )
1414+
self.assertEqual( len(q('.bg-success')), 1 )
14151415

14161416
f = self.topic.feedback_set.first()
14171417
f.time = self.hour_ago
@@ -1421,13 +1421,13 @@ def test_feedback_topic_badges(self):
14211421
response = self.client.get(url)
14221422
self.assertEqual(response.status_code,200)
14231423
q = PyQuery(response.content)
1424-
self.assertEqual( len(q('.label-success')), 0 )
1424+
self.assertEqual( len(q('.bg-success')), 0 )
14251425

14261426
TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
14271427
response = self.client.get(url)
14281428
self.assertEqual(response.status_code,200)
14291429
q = PyQuery(response.content)
1430-
self.assertEqual( len(q('.label-success')), 0 )
1430+
self.assertEqual( len(q('.bg-success')), 0 )
14311431

14321432
class NewActiveNomComTests(TestCase):
14331433

@@ -2599,5 +2599,4 @@ def test_decorate_volunteers_with_qualifications(self):
25992599
if v.person == office_person:
26002600
self.assertEqual(v.qualifications,'path_2')
26012601
if v.person == author_person:
2602-
self.assertEqual(v.qualifications,'path_3')
2603-
2602+
self.assertEqual(v.qualifications,'path_3')

‎ietf/static/css/ietf.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $enable-negative-margins: true;
3232
@import "~/node_modules/bootstrap/scss/accordion";
3333
// @import "~/node_modules/bootstrap/scss/breadcrumb";
3434
// @import "~/node_modules/bootstrap/scss/pagination";
35-
// @import "~/node_modules/bootstrap/scss/badge";
35+
@import "~/node_modules/bootstrap/scss/badge";
3636
// @import "~/node_modules/bootstrap/scss/alert";
3737
// @import "~/node_modules/bootstrap/scss/progress";
3838
// @import "~/node_modules/bootstrap/scss/list-group";

‎ietf/templates/doc/charter/submit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h1>Charter submission</h1>
4242
<td>
4343
{{ group.state.name }}
4444
{% if requested_close %}
45-
<div class="label label-info">In the process of being closed</div>
45+
<div class="badge bg-info">In the process of being closed</div>
4646
{% endif %}
4747
</td>
4848
</tr>

‎ietf/templates/doc/document_ballot_content.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="col-md-2 hidden-sm hidden-xs">
77

88
{% for n, positions in position_groups %}
9-
<h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
9+
<h4><span class="badge bg-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
1010
{% for p in positions %}
1111
<div class="balloter-name">
1212
{% if p.is_old_pos %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
@@ -76,7 +76,7 @@ <h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
7676
<h4 class="anchor-target" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{{ p.balloter.plain_name }}
7777
<span class="float-end">
7878
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
79-
<span class="label label-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
79+
<span class="badge bg-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
8080
{% if user|has_role:"Secretariat" %}
8181
<a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}" title="Click to edit the position of {{ p.balloter.plain_name }}" class="btn btn-primary btn-xs">Edit</a>
8282
{% endif %}
@@ -130,7 +130,7 @@ <h4 class="anchor-target" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|sl
130130
<span class="text-muted">({{ p.balloter.plain_name }}; former steering group member)</span>
131131
<span class="float-end">
132132
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
133-
<span class="label label-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
133+
<span class="badge bg-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
134134
{% if user|has_role:"Secretariat" %}
135135
<a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}" title="Click to edit the position of {{ p.balloter.plain_name }}" class="btn btn-primary btn-xs">Edit</a>
136136
{% endif %}

‎ietf/templates/doc/document_bofreq.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<td>
3535
{{doc.get_state.slug|capfirst}} BOF request
3636
{% if snapshot %}
37-
<span class="label label-warning">Snapshot</span>
37+
<span class="badge bg-warning">Snapshot</span>
3838
{% endif %}
3939
</td>
4040
</tr>

‎ietf/templates/doc/document_charter.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<a href="{{ group.about_url }}">({{ group.acronym }})</a>
5858

5959
{% if snapshot %}
60-
<span class="label label-warning">Snapshot</span>
60+
<span class="badge bg-warning">Snapshot</span>
6161
{% endif %}
6262
</td>
6363
</tr>
@@ -96,10 +96,10 @@
9696
{% endif %}
9797

9898
{% if chartering == "initial" %}
99-
<span class="label label-info">Initial chartering</span>
99+
<span class="badge bg-info">Initial chartering</span>
100100
{% endif %}
101101
{% if chartering == "rechartering" %}
102-
<span class="label label-info">Rechartering</span>
102+
<span class="badge bg-info">Rechartering</span>
103103
{% endif %}
104104
</td>
105105
</tr>

0 commit comments

Comments
 (0)