fontawesome -> bootstrap-icons

 - Legacy-Id: 19608

Author: larseggert

ietf/doc/templatetags/ietf_filters.py

@@ -426,7 +426,7 @@ def format_snippet(text, trunc_words=25):
     full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text)))))
     snippet = truncatewords_html(full, trunc_words)
     if snippet != full:
-        return mark_safe('<div class="snippet">%s<button class="btn btn-xs btn-default show-all"><span class="fa fa-caret-down"></span></button></div><div class="hidden full">%s</div>' % (snippet, full))
+        return mark_safe('<div class="snippet">%s<button class="btn btn-xs btn-default show-all"><span class="bi bi-caret-down"></span></button></div><div class="hidden full">%s</div>' % (snippet, full))
     return full
 
 @register.simple_tag

ietf/meeting/tests_views.py

@@ -2136,7 +2136,7 @@ def test_edit_meeting_schedule(self):
             s_other = s2 if s == s1 else s1
             self.assertEqual(len(constraints), 3)
             self.assertEqual(constraints.eq(0).attr("data-sessions"), str(s_other.pk))
-            self.assertEqual(constraints.eq(0).find(".fa-user-o").parent().text(), "1") # 1 person in the constraint
+            self.assertEqual(constraints.eq(0).find(".bi-person").parent().text(), "1") # 1 person in the constraint
             self.assertEqual(constraints.eq(1).attr("data-sessions"), str(s_other.pk))
             self.assertEqual(constraints.eq(1).find(".encircled").text(), "1" if s_other == s2 else "-1")
             self.assertEqual(constraints.eq(2).attr("data-sessions"), str(s_other.pk))
@@ -2472,7 +2472,7 @@ def test_edit_meeting_schedule_conflict_types(self):
 
         # Now enable the 'chair_conflict' constraint only
         chair_conflict = ConstraintName.objects.get(slug='chair_conflict')
-        chair_conf_label = b'<i class="fa fa-gavel"/>'  # result of etree.tostring(etree.fromstring(editor_label))
+        chair_conf_label = b'<i class="bi bi-person-plus"/>'  # result of etree.tostring(etree.fromstring(editor_label))
         meeting.group_conflict_types.add(chair_conflict)
         r = self.client.get(url)
         q = PyQuery(r.content)
@@ -2732,7 +2732,7 @@ def test_session_details(self):
         q = PyQuery(r.content)
         self.assertTrue(q('h2#session_%s div#session-buttons-%s' % (session.id, session.id)),
                                'Session detail page does not contain session tool buttons') 
-        self.assertFalse(q('h2#session_%s div#session-buttons-%s span.fa-arrows-alt' % (session.id, session.id)), 
+        self.assertFalse(q('h2#session_%s div#session-buttons-%s span.bi-arrows-fullscreen' % (session.id, session.id)),
                          'The session detail page is incorrectly showing the "Show meeting materials" button')
 
     def test_session_details_past_interim(self):

ietf/meeting/utils.py

@@ -301,7 +301,7 @@ def preprocess_constraints_for_meeting_schedule_editor(meeting, sessions):
     joint_with_groups_constraint_name = ConstraintName(
         slug='joint_with_groups',
         name="Joint session with",
-        editor_label="<i class=\"fa fa-clone\"></i>",
+        editor_label="<i class=\"bi bi-link\"></i>",
         order=8,
     )
     constraint_names[joint_with_groups_constraint_name.slug] = joint_with_groups_constraint_name
@@ -535,4 +535,4 @@ def preprocess_meeting_important_dates(meetings):
         m.important_dates = m.importantdate_set.prefetch_related("name")
         for d in m.important_dates:
             d.midnight_cutoff = "UTC 23:59" in d.name.name
-    
+    

ietf/name/fixtures/names.json

@@ -6237,7 +6237,7 @@
   {
     "fields": {
       "desc": "",
-      "editor_label": "<i class=\"fa fa-user-o\"></i>{count}",
+      "editor_label": "<i class=\"bi bi-person\"></i>{count}",
       "is_group_conflict": false,
       "name": "Person must be present",
       "order": 4,
@@ -6250,7 +6250,7 @@
   {
     "fields": {
       "desc": "Indicates other WGs the chairs also lead or will be active participants in",
-      "editor_label": "<i class=\"fa fa-gavel\"></i>",
+      "editor_label": "<i class=\"bi bi-person-plus\"></i>",
       "is_group_conflict": true,
       "name": "Chair conflict",
       "order": 8,
@@ -6302,7 +6302,7 @@
   {
     "fields": {
       "desc": "Indicates WGs with which key participants (presenter, secretary, etc.)  may overlap",
-      "editor_label": "<i class=\"fa fa-key\"></i>",
+      "editor_label": "<i class=\"bi bi-key\"></i>",
       "is_group_conflict": true,
       "name": "Key participant conflict",
       "order": 10,
@@ -6315,7 +6315,7 @@
   {
     "fields": {
       "desc": "Indicates WGs with a related technology or a closely related charter",
-      "editor_label": "<i class=\"fa fa-rocket\"></i>",
+      "editor_label": "<i class=\"bi bi-link\"></i>",
       "is_group_conflict": true,
       "name": "Technology overlap",
       "order": 9,
@@ -6341,7 +6341,7 @@
   {
     "fields": {
       "desc": "",
-      "editor_label": "<i class=\"fa fa-calendar-o\"></i>",
+      "editor_label": "<i class=\"bi bi-calendar\"></i>",
       "is_group_conflict": false,
       "name": "Can't meet within timerange",
       "order": 5,
@@ -6354,7 +6354,7 @@
   {
     "fields": {
       "desc": "",
-      "editor_label": "<i class=\"fa fa-step-forward\"></i>",
+      "editor_label": "<i class=\"bi bi-skip-end\"></i>",
       "is_group_conflict": false,
       "name": "Request for adjacent scheduling with another WG",
       "order": 7,
@@ -15693,4 +15693,4 @@
     "model": "utils.versioninfo",
     "pk": 4
   }
-]
+]

ietf/name/migrations/0017_update_constraintname_order_and_label.py

@@ -12,13 +12,13 @@ def update_editor_labels(apps, schema_editor):
         ConstraintName = apps.get_model('name', 'ConstraintName')
         for cn in ConstraintName.objects.all():
             cn.editor_label = {
-                'bethere': "<i class=\"fa fa-user-o\"></i>{count}",
-                'wg_adjacent': "<i class=\"fa fa-step-forward\"></i>",
+                'bethere': "<i class=\"bi bi-person\"></i>{count}",
+                'wg_adjacent': "<i class=\"bi bi-skip-end\"></i>",
                 'conflict': "<span class=\"encircled\">1</span>",
                 'conflic2': "<span class=\"encircled\">2</span>",
                 'conflic3': "<span class=\"encircled\">3</span>",
                 'time_relation': "&Delta;",
-                'timerange': "<i class=\"fa fa-calendar-o\"></i>",
+                'timerange': "<i class=\"bi bi-calendar\"></i>",
             }.get(cn.slug, cn.editor_label)
 
             cn.order = {

ietf/name/migrations/0026_add_conflict_constraintnames.py

@@ -18,21 +18,21 @@
         slug='chair_conflict',
         name='Chair conflict',
         desc='Indicates other WGs the chairs also lead or will be active participants in',
-        editor_label='<i class="fa fa-gavel"></i>',
+        editor_label='<i class="bi bi-person-plus"></i>',
     ),
     ConstraintInfo(
         replaces='conflic2',
         slug='tech_overlap',
         name='Technology overlap',
         desc='Indicates WGs with a related technology or a closely related charter',
-        editor_label='<i class="fa fa-rocket"></i>',
+        editor_label='<i class="bi bi-link"></i>',
     ),
     ConstraintInfo(
         replaces='conflic3',
         slug='key_participant',
         name='Key participant conflict',
         desc='Indicates WGs with which key participants (presenter, secretary, etc.)  may overlap',
-        editor_label='<i class="fa fa-key"></i>',
+        editor_label='<i class="bi bi-key"></i>',
     )
 ]
 
@@ -72,4 +72,4 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(forward, reverse),
-    ]
+    ]

ietf/static/ietf/js/ietf.js

@@ -254,9 +254,9 @@ $(document).ready(function () {
         // customize the styling a bit; more is done in ietf.css
         $.tablesorter.themes.bootstrap = {
             table: "",
-            iconSortNone: "fa fa-sort",
-            iconSortAsc: "fa fa-sort-asc",
-            iconSortDesc: "fa fa-sort-desc",
+            iconSortNone: "bi bi-arrow-down-up",
+            iconSortAsc: "bi bi-arrow-down-up-asc",
+            iconSortDesc: "bi bi-arrow-down-up-desc",
             hover: "active"
         };
         // disable the URL-based sorting stuff that uses the django backend

ietf/submit/checkers.py

@@ -52,7 +52,7 @@ class DraftIdnitsChecker(object):
 
     # start using this when we provide more in the way of warnings during
     # submission checking:
-    # symbol = '<span class="fa fa-check-square"></span>'
+    # symbol = '<span class="bi bi-check-square"></span>'
     # symbol = u'<span class="large">\ua17d</span>' # Yi syllable 'nit'
     # symbol = u'<span class="large">\ub2e1</span>' # Hangul syllable 'nit'
 

ietf/templates/api/index.html

@@ -178,9 +178,9 @@ <h3 id="simplified-documents" class="anchor-target">Simplified documents API</h3
         document attributes are necessary for an application is 
         available for all documents at the relative url <code>doc.json</code>, e.g.,
         <code>{% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %}</code>
-        <a href="{% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %}"><span class="fa fa-external-link"></span></a>.
+        <a href="{% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %}"><span class="bi bi-box-arrow-up-right"></span></a>.
         You can also specify an RFC:  <code>{% url 'ietf.doc.views_doc.document_json' name='rfc2026' %}</code>
-        <a href="{% url 'ietf.doc.views_doc.document_json' name='rfc2026' %}"><span class="fa fa-external-link"></span></a>.
+        <a href="{% url 'ietf.doc.views_doc.document_json' name='rfc2026' %}"><span class="bi bi-box-arrow-up-right"></span></a>.
         No API key is needed to access this.
 
       </p>

ietf/templates/base.html

@@ -112,9 +112,9 @@
                             {{revision_date}} |
                             {% endif %}
                             Report a bug:
-                            <a href="https://trac.ietf.org/trac/ietfdb/newticket">Tracker:<span class="fa fa-bug"></span></a>
+                            <a href="https://trac.ietf.org/trac/ietfdb/newticket">Tracker:<span class="bi bi-bug"></span></a>
                             {% if bugreport_email %}
-                            <a href="mailto:{{ bugreport_email }}">Email:<span class="fa fa-envelope"></span></a>
+                            <a href="mailto:{{ bugreport_email }}">Email:<span class="bi bi-envelope"></span></a>
                             {% endif %}
                             <br>
                             {% if python_version %}Python {{ python_version }}{% endif %} |