From bb5810a934145831d666042f3510ed047910a70d Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Wed, 10 Nov 2021 11:15:46 +0000 Subject: [PATCH] Labels are badges in bs5. - Legacy-Id: 19616 --- ietf/doc/templatetags/ballot_icon.py | 6 ++--- ietf/doc/templatetags/ietf_filters.py | 6 ++--- ietf/doc/views_review.py | 4 ++-- ietf/group/tests_info.py | 7 +++--- ietf/nomcom/tests.py | 23 +++++++++---------- ietf/static/css/ietf.scss | 2 +- ietf/templates/doc/charter/submit.html | 2 +- .../doc/document_ballot_content.html | 6 ++--- ietf/templates/doc/document_bofreq.html | 2 +- ietf/templates/doc/document_charter.html | 6 ++--- .../doc/document_conflict_review.html | 4 ++-- ietf/templates/doc/document_draft.html | 2 +- ietf/templates/doc/document_material.html | 2 +- .../templates/doc/document_referenced_by.html | 2 +- .../templates/doc/document_status_change.html | 2 +- ietf/templates/doc/review/request_info.html | 2 +- .../doc/search/search_result_row.html | 12 +++++----- ietf/templates/group/all_status.html | 4 ++-- ietf/templates/group/customize_workflow.html | 2 +- ietf/templates/group/edit_milestones.html | 8 +++---- ietf/templates/group/group_about.html | 4 ++-- ietf/templates/group/group_base.html | 6 ++--- .../group/manage_review_requests.html | 6 ++--- ietf/templates/group/milestones.html | 2 +- ietf/templates/group/review_requests.html | 12 +++++----- ietf/templates/group/reviewer_overview.html | 2 +- ietf/templates/ietfauth/review_overview.html | 4 ++-- ietf/templates/liaisons/liaison_table.html | 4 ++-- ietf/templates/meeting/agenda.html | 16 ++++++------- .../templates/meeting/agenda_personalize.html | 12 +++++----- ietf/templates/meeting/group_materials.html | 16 ++++++------- ietf/templates/meeting/group_proceedings.html | 12 +++++----- ietf/templates/meeting/interim_pending.html | 4 ++-- ietf/templates/meeting/past.html | 2 +- ietf/templates/meeting/schedule_list.html | 8 +++---- .../meeting/session_details_panel.html | 4 ++-- ietf/templates/meeting/session_materials.html | 8 +++---- ietf/templates/meeting/upcoming.html | 6 ++--- ietf/templates/nomcom/view_feedback.html | 4 ++-- .../nomcom/view_feedback_nominee.html | 2 +- .../nomcom/view_feedback_pending.html | 2 +- .../templates/nomcom/view_feedback_topic.html | 2 +- ietf/templates/submit/submission_status.html | 4 ++-- 43 files changed, 122 insertions(+), 124 deletions(-) diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py index e4582d699..383307981 100644 --- a/ietf/doc/templatetags/ballot_icon.py +++ b/ietf/doc/templatetags/ballot_icon.py @@ -204,9 +204,9 @@ def state_age_colored(doc): goal1 = 14 goal2 = 28 if days > goal2: - class_name = "label label-danger" + class_name = "badge bg-danger" elif days > goal1: - class_name = "label label-warning" + class_name = "badge bg-warning" else: class_name = "ietf-small" if days > goal1: @@ -231,6 +231,6 @@ def auth48_alert_badge(doc): rfced_state = doc.get_state_slug('draft-rfceditor') if rfced_state == 'auth48': - return mark_safe('AUTH48') + return mark_safe('AUTH48') return '' \ No newline at end of file diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 3e6cb6e1f..d8d38bb90 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -614,17 +614,17 @@ def action_holder_badge(action_holder): '' >>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=16))) - 'for 16 days' + 'for 16 days' >>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=30))) - 'for 30 days' + 'for 30 days' >>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit """ age_limit = settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS age = (datetime.datetime.now() - action_holder.time_added).days if age > age_limit: - return mark_safe('for %d day%s' % ( + return mark_safe('for %d day%s' % ( age_limit, age, 's' if age != 1 else '')) diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 6bf431b75..1412fc6d0 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -577,11 +577,11 @@ class CompleteReviewForm(forms.Form): kwargs["initial"]["reviewed_rev"] = last_version self.fields["reviewed_rev"].help_text = mark_safe( - " ".join("{1}".format(reviewed_rev_class[i], *r) + " ".join("{1}".format(reviewed_rev_class[i], *r) for i, r in enumerate(known_revisions))) else: self.fields["reviewed_rev"].help_text = mark_safe( - " ".join("{1}".format('', *r) + " ".join("{1}".format('', *r) for i, r in enumerate(known_revisions))) self.fields["result"].queryset = self.fields["result"].queryset.filter(reviewteamsettings_review_results_set__group=team) diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py index aba0f975e..b3e8071bb 100644 --- a/ietf/group/tests_info.py +++ b/ietf/group/tests_info.py @@ -448,13 +448,13 @@ class GroupPagesTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEqual(q('.label-warning').text(),"Concluded WG") + self.assertEqual(q('.bg-warning').text(),"Concluded WG") replaced_group = GroupFactory(state_id='replaced') url = urlreverse("ietf.group.views.history",kwargs={'acronym':replaced_group.acronym}) r = self.client.get(url) self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEqual(q('.label-warning').text(),"Replaced WG") + self.assertEqual(q('.bg-warning').text(),"Replaced WG") class GroupEditTests(TestCase): @@ -1847,5 +1847,4 @@ class AcronymValidationTests(TestCase): wg = GroupFactory(acronym='bad-idea', type_id='wg') form = GroupForm({'acronym':wg.acronym,'name':wg.name,'state':wg.state_id},group=wg, group_type=wg.type_id) - self.assertTrue(form.is_valid()) - + self.assertTrue(form.is_valid()) \ No newline at end of file diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py index e977bef19..7b6d9f4d9 100644 --- a/ietf/nomcom/tests.py +++ b/ietf/nomcom/tests.py @@ -1354,7 +1354,7 @@ class FeedbackLastSeenTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 4 ) + self.assertEqual( len(q('.bg-success')), 4 ) f = self.nc.feedback_set.first() f.time = self.hour_ago @@ -1364,20 +1364,20 @@ class FeedbackLastSeenTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 3 ) + self.assertEqual( len(q('.bg-success')), 3 ) FeedbackLastSeen.objects.update(time=self.second_from_now) response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 1 ) + self.assertEqual( len(q('.bg-success')), 1 ) TopicFeedbackLastSeen.objects.create(reviewer=self.member,topic=self.topic) TopicFeedbackLastSeen.objects.update(time=self.second_from_now) response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 0 ) + self.assertEqual( len(q('.bg-success')), 0 ) def test_feedback_nominee_badges(self): url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id}) @@ -1386,7 +1386,7 @@ class FeedbackLastSeenTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 3 ) + self.assertEqual( len(q('.bg-success')), 3 ) f = self.nc.feedback_set.first() f.time = self.hour_ago @@ -1396,13 +1396,13 @@ class FeedbackLastSeenTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 2 ) + self.assertEqual( len(q('.bg-success')), 2 ) FeedbackLastSeen.objects.update(time=self.second_from_now) response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 0 ) + self.assertEqual( len(q('.bg-success')), 0 ) def test_feedback_topic_badges(self): url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id}) @@ -1411,7 +1411,7 @@ class FeedbackLastSeenTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 1 ) + self.assertEqual( len(q('.bg-success')), 1 ) f = self.topic.feedback_set.first() f.time = self.hour_ago @@ -1421,13 +1421,13 @@ class FeedbackLastSeenTests(TestCase): response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 0 ) + self.assertEqual( len(q('.bg-success')), 0 ) TopicFeedbackLastSeen.objects.update(time=self.second_from_now) response = self.client.get(url) self.assertEqual(response.status_code,200) q = PyQuery(response.content) - self.assertEqual( len(q('.label-success')), 0 ) + self.assertEqual( len(q('.bg-success')), 0 ) class NewActiveNomComTests(TestCase): @@ -2599,5 +2599,4 @@ class VolunteerDecoratorUnitTests(TestCase): if v.person == office_person: self.assertEqual(v.qualifications,'path_2') if v.person == author_person: - self.assertEqual(v.qualifications,'path_3') - + self.assertEqual(v.qualifications,'path_3') \ No newline at end of file diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss index 48ccaf931..bf2d8ae80 100644 --- a/ietf/static/css/ietf.scss +++ b/ietf/static/css/ietf.scss @@ -32,7 +32,7 @@ $enable-negative-margins: true; @import "~/node_modules/bootstrap/scss/accordion"; // @import "~/node_modules/bootstrap/scss/breadcrumb"; // @import "~/node_modules/bootstrap/scss/pagination"; -// @import "~/node_modules/bootstrap/scss/badge"; +@import "~/node_modules/bootstrap/scss/badge"; // @import "~/node_modules/bootstrap/scss/alert"; // @import "~/node_modules/bootstrap/scss/progress"; // @import "~/node_modules/bootstrap/scss/list-group"; diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index 6f4fb879b..2262ca5ce 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -42,7 +42,7 @@ {{ group.state.name }} {% if requested_close %} -
In the process of being closed
+
In the process of being closed
{% endif %} diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index 288f611e3..9a9dbf745 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -6,7 +6,7 @@