Replace glyphicons with bootstrap-icons.

larseggert · larseggert · commit 1d559374ec3a · 2021-11-10T08:08:02.000Z
- Legacy-Id: 19607
diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss
@@ -53,13 +53,9 @@ $enable-negative-margins: true;
 @import "~/node_modules/bootstrap/scss/utilities/api";
 
 // Make the bootstrap icons available.
-// FIXME: This requires cp -r node_modules/bootstrap-icons/font/fonts static/src/css/
-// to be run manually due to parcel limitations.
-// @import "../../../node_modules/bootstrap-icons/font/bootstrap-icons";
-
-// For now, let's stick with font-awesome v4:
-$fa-font-path: "~/node_modules/font-awesome/fonts";
-@import "~/node_modules/font-awesome/scss/font-awesome";
+$bootstrap-icons-font-src: url("~node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff2?a97b3594ad416896e15824f6787370e0") format("woff2"),
+url("~node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff?a97b3594ad416896e15824f6787370e0") format("woff") !default;
+@import "../../../node_modules/bootstrap-icons/font/bootstrap-icons";
 
 // Install the datatables.net bootstrap5 styles.
 // FIXME: Including this with ~ fails for some odd reason?
diff --git a/ietf/static/ietf/js/liaisons.js b/ietf/static/ietf/js/liaisons.js
@@ -59,7 +59,7 @@ var attachmentWidget = {
             html += '</span>';
             container.hide();
         });
-        //html += ' <a href="" class="removeAttach glyphicon glyphicon-remove text-danger"></a>';
+        //html += ' <a href="" class="removeAttach bi bi-x text-danger"></a>';
         html += ' <a href="" class="removeAttach btn btn-default btn-xs">Delete</a>';
         html += '</div>';
         attachmentWidget.config.showOnDisplay.html(html);
diff --git a/ietf/templates/community/list_menu.html b/ietf/templates/community/list_menu.html
@@ -9,7 +9,7 @@
 
   {% if clist.pk != None %}
     <li><a class="btn btn-primary" href="{% if clist.group %}{% url "ietf.community.views.subscription" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.subscription" username=clist.user.username %}{% endif %}">
-      <i class="glyphicon glyphicon-envelope"></i>
+      <i class="bi bi-envelope"></i>
       {% if subscribed %}
         Change subscription
       {% else %}
@@ -18,5 +18,5 @@
     </a></li>
   {% endif %}
 
-  <li><a class="btn btn-primary" href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" username=clist.user.username %}{% endif %}"><i class="glyphicon glyphicon-list"></i> Export as CSV</a></li>
+  <li><a class="btn btn-primary" href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" username=clist.user.username %}{% endif %}"><i class="bi bi-file-ruled"></i> Export as CSV</a></li>
 </ul>
diff --git a/ietf/templates/community/view_list.html b/ietf/templates/community/view_list.html
@@ -13,7 +13,7 @@ <h1>{{ clist.long_name }}</h1>
 
   {% if can_manage_list %}
     <a class="btn btn-primary" href="{% url "ietf.community.views.manage_list" username=clist.user.username %}">
-      <i class="glyphicon glyphicon-cog"></i>
+      <i class="bi bi-gear"></i>
       Manage list
     </a>
   {% endif %}
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
@@ -161,7 +161,7 @@ <h2>{% cycle section %}. IETF document or other contribution to which this IPR d
 
         <div class="form-group">
           <label class="col-md-2 control-label"></label>
-          <div class="col-md-10"><a class="draft-add-row btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add more</a></div>
+          <div class="col-md-10"><a class="draft-add-row btn btn-primary"><span class="bi bi-plus" aria-hidden="true"></span> Add more</a></div>
         </div>
 
         {% bootstrap_field form.other_designations layout='horizontal' %}
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
@@ -39,7 +39,7 @@ <h1>History for IPR disclosure<br><small>{{ ipr.title }}</small></h1>
           <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
           <td>{{ e.type }}
             {% if e.response_due and e.response_past_due %}
-              <span class="glyphicon glyphicon-exclamation-sign" title="Response overdue"></span>
+              <span class="bi bi-exclamation-circle" title="Response overdue"></span>
             {% endif %}
           </td>
           <td>{{ e.by }}</td>
diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
@@ -30,10 +30,10 @@ <h1>IPR Details<br><small>{{ ipr.title }}</small></h1>
         {% endif %}
 
         {% if ipr.updates and ipr.state_id == 'pending' and ipr.update_notified_date or not ipr.updates and ipr.state_id == 'pending' %}
-          <a class="btn btn-primary" href="{% url 'ietf.ipr.views.post' id=ipr.id %}"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Post</a>
+          <a class="btn btn-primary" href="{% url 'ietf.ipr.views.post' id=ipr.id %}"><span class="bi bi-check" aria-hidden="true"></span> Post</a>
         {% endif %}
 
-        <a class="btn btn-primary" href="{% url 'ietf.ipr.views.email' id=ipr.id %}" title="Email submitter of this disclsoure"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Email</a>
+        <a class="btn btn-primary" href="{% url 'ietf.ipr.views.email' id=ipr.id %}" title="Email submitter of this disclsoure"><span class="bi bi-envelope" aria-hidden="true"></span> Email</a>
         <a class="btn btn-primary" href="{% url 'ietf.ipr.views.edit' id=ipr.id %}">Edit</a>
         <a class="btn btn-primary" href="{% url 'ietf.ipr.views.state' id=ipr.id %}">Change State</a>
       {% endif %}
diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html
@@ -47,7 +47,7 @@
               {% if latest_msgout and latest_msgout.response_due %}
                 {{ latest_msgout.response_due|date:"Y-m-d" }}
                 {% if latest_msgout.response_past_due %}
-                  <span class="glyphicon glyphicon-exclamation-sign" title="Response overdue"></span>
+                  <span class="bi bi-exclamation-circle" title="Response overdue"></span>
                 {% endif %}
               {% endif %}
             </td>
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
@@ -35,7 +35,7 @@ <h1>History for Liaison Statement<br><small>{{ liaison.title }}</small></h1>
           <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
           <td>{{ e.type }}
             {% if e.response_due and e.response_past_due %}
-              <span class="glyphicon glyphicon-exclamation-sign" title="Response overdue"></span>
+              <span class="bi bi-exclamation-circle" title="Response overdue"></span>
             {% endif %}
           </td>
           <td>{{ e.by }}</td>
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
@@ -148,7 +148,7 @@ <h1>Interim Meeting Request</h1>
 
     <div class="form-group">
     <div class="col-md-12">
-    <button id="add_session" type="button" class="btn btn-primary" style="display: none;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>Add Session</button>
+    <button id="add_session" type="button" class="btn btn-primary" style="display: none;"><span class="bi bi-plus" aria-hidden="true"></span>Add Session</button>
     </div>
     </div>
 
diff --git a/ietf/templates/meeting/interim_request_edit.html b/ietf/templates/meeting/interim_request_edit.html
@@ -95,7 +95,7 @@ <h1>Edit Interim Meeting Request</h1>
 
     <div class="form-group">
     <div class="col-md-12">
-    <button id="add_session" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>Add Session</button>
+    <button id="add_session" type="button" class="btn btn-primary"><span class="bi bi-plus" aria-hidden="true"></span>Add Session</button>
     </div>
     </div>
 
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
@@ -44,7 +44,7 @@
     {% if timeslot.location.audio_stream_url %}
       <a class=""
         href="{{timeslot.location.audio_stream_url|format:session }}"
-        title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
+        title="Audio stream"><span class="bi bi-headphones"></span>
       </a>
     {% endif %}
     <!-- Remote call-in -->
diff --git a/ietf/templates/submit/submission_email.html b/ietf/templates/submit/submission_email.html
@@ -49,7 +49,7 @@ <h2 class="anchor-target" id="approvals">Email for {{ submission.name }}</h2>
 
       {% if user|has_role:"Secretariat" %}
         <tr>
-          <td><a id="reply{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=message.pk %}" title="Reply"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Reply</a></td>
+          <td><a id="reply{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=message.pk %}" title="Reply"><span class="bi bi-envelope" aria-hidden="true"></span> Reply</a></td>
         </tr>
       {% endif %}
     </table>
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
@@ -385,7 +385,7 @@ <h2>Approve submission</h2>
 
   {% if user|has_role:"Secretariat" %}
     <p></p>
-    <a id="send{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk %}" title="Email submitter"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Send Email</a>
+    <a id="send{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk %}" title="Email submitter"><span class="bi bi-envelope" aria-hidden="true"></span> Send Email</a>
   {% endif %}
 
   {% if show_send_full_url %}
@@ -426,7 +426,7 @@ <h2>History</h2>
               {% if user.is_authenticated %}
                 <td> 
                   {% if  e.desc|startswith:"Received message" and user|has_role:"Secretariat" %}
-                    <a id="reply{{ submission.pk }}" class="btn btn-primary btn-xs" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}" title="Reply"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Reply</a>
+                    <a id="reply{{ submission.pk }}" class="btn btn-primary btn-xs" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}" title="Reply"><span class="bi bi-envelope" aria-hidden="true"></span> Reply</a>
                   {% endif %}
                   Email: <a id="aw{{ submission.pk }}-{{ m.pk }}" href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk access_token=submission.access_token %}">{{ e.desc }}</a></td>
               {% else %}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,10 +2,10 @@
   "dependencies": {
     "@popperjs/core": "^2.10.2",
     "bootstrap": "^5.1.3",
+    "bootstrap-icons": "^1.7.0",
     "d3": "^3.5.17",
     "datatables.net": "^1.11.3",
     "datatables.net-bs5": "^1.11.3",
-    "font-awesome": "^4.7.0",
     "jquery": "^3.6.0"
   },
   "devDependencies": {
@@ -30,4 +30,4 @@
       "distDir": "ietf/static/dist/ietf"
     }
   }
-}
+}
