Merge branch 'bmb/new-fontawesome' into bmb/b5-styleguide

dimagi · Jan 25, 2024 · be24c7a · be24c7a
2 parents d6f090a + 284a021
commit be24c7a
Show file tree

Hide file tree

Showing 72 changed files with 126 additions and 128 deletions.
diff --git a/corehq/apps/app_manager/static/app_manager/js/releases/app_diff.js b/corehq/apps/app_manager/static/app_manager/js/releases/app_diff.js
@@ -247,7 +247,7 @@ hqDefine('app_manager/js/releases/app_diff', function () {
                 self.options.formNameMap[self.id].form_name[self.options.lang]
             );
             var lines = [
-                HtmlUtils.makeLi(sanitize(formName), 'diff-form', 'file-o'),
+                HtmlUtils.makeLi(sanitize(formName), 'diff-form', 'fa-regular fa-file'),
                 HtmlUtils.makeLi(gettext('Save Questions'), 'diff-case-action diff-underline fa-ul', '', true),
                 HtmlUtils.makeUl('diff-questions diff-save-questions fa-ul'),
                 _.map(self.saveQuestions, function (q) { return q.toString(); }).join('\n'),
@@ -319,7 +319,7 @@ hqDefine('app_manager/js/releases/app_diff', function () {
         self.toString = function () {
             var lines = [
                 // We want these to be considered one line
-                (HtmlUtils.makeLi(sanitize(self.name[self.options.lang]), 'diff-form', 'file-o') +
+                (HtmlUtils.makeLi(sanitize(self.name[self.options.lang]), 'diff-form', 'fa-regular fa-file') +
                     HtmlUtils.makeSpan(sanitize(' ' + self.shortComment), 'diff-comment', '', true)),
                 HtmlUtils.makeUl('diff-questions fa-ul'),
                 _.map(self.questions, function (q) { return q.toString(); }).join('\n'),

diff --git a/corehq/apps/app_manager/static/app_manager/js/summary/utils.js b/corehq/apps/app_manager/static/app_manager/js/summary/utils.js
@@ -15,7 +15,7 @@ hqDefine("app_manager/js/summary/utils",[
     };
 
     var formIcon = function (form) {
-        var formIcon = 'fa fa-file-o appnav-primary-icon';
+        var formIcon = 'fa-regular fa-file appnav-primary-icon';
         if (form.action_type === 'open') {
             formIcon = 'fcc fcc-app-createform appnav-primary-icon appnav-primary-icon-lg';
         } else if (form.action_type === 'close') {
@@ -33,7 +33,7 @@ hqDefine("app_manager/js/summary/utils",[
         } else if (module.module_type === 'report') {
             moduleIcon = 'fa fa-bar-chart appnav-primary-icon';
         } else if (module.module_type === 'shadow') {
-            moduleIcon = 'fa fa-folder-open-o appnav-primary-icon';
+            moduleIcon = 'fa-regular fa-folder-open appnav-primary-icon';
         } else if (!module.is_surveys) {
             moduleIcon = 'fa fa-bars appnav-primary-icon';
         }

diff --git a/corehq/apps/app_manager/templates/app_manager/base_summary.html b/corehq/apps/app_manager/templates/app_manager/base_summary.html
@@ -56,7 +56,7 @@
               <div class="appnav-item{% if page_type == 'form_summary' %} active{% endif %}">
                 <a href="{% url 'app_form_summary' domain app_id %}"
                    class="appnav-title appnav-title-secondary appnav-responsive">
-                  <i class="fa fa-file-text-o appnav-primary-icon"></i>
+                  <i class="fa-regular fa-file-lines appnav-primary-icon"></i>
                   <span>{% trans "Form Summary" %}</span>
                 </a>
                 <a class="appnav-secondary track-usage-link"

diff --git a/corehq/apps/app_manager/templates/app_manager/download_index.html b/corehq/apps/app_manager/templates/app_manager/download_index.html
@@ -68,15 +68,15 @@ <h2>Downloads</h2>
     <tr>
       <td>
         <a href="#download_ccz" data-toggle="modal"  class='download-zip'>
-          <i class="fa fa-file-zip-o"></i>
+          <i class="fa-regular fa-file-zipper"></i>
           CommCare.ccz
         </a>
       </td>
     </tr>
     <tr>
       <td>
         <a href="{% url "download_bulk_app_translations" app.domain app.id %}">
-          <i class="fa fa-file-excel-o"></i>
+          <i class="fa-regular fa-file-excel"></i>
           {% trans "Bulk application translations" %}
         </a>
       </td>

diff --git a/corehq/apps/app_manager/templates/app_manager/form_designer.html b/corehq/apps/app_manager/templates/app_manager/form_designer.html
@@ -103,7 +103,7 @@ <h4>{% blocktrans %}This is a <i class="fcc fcc-app-updateform"></i> Followup Fo
   </script>
 
   <script type="text/html" id="fd-hq-helptext-survey">
-    <h4>{% blocktrans %}This is a <i class="fa fa-file-o"></i> Survey.{% endblocktrans %}</h4>
+    <h4>{% blocktrans %}This is a <i class="fa-regular fa-file"></i> Survey.{% endblocktrans %}</h4>
     <p>
       {% blocktrans %}
         It's useful for asking questions once, for information that you won't need to follow up on later.

diff --git a/corehq/apps/app_manager/templates/app_manager/form_view.html b/corehq/apps/app_manager/templates/app_manager/form_view.html
@@ -94,9 +94,9 @@
       {% elif form.requires_case %}
         {% inline_edit_trans form.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fcc fcc-app-updateform' postSave=postSave disallow_edit=disallow_edit %}
       {% elif form.form_type == 'shadow_form' %}
-        {% inline_edit_trans form.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa fa-moon-o' postSave=postSave disallow_edit=disallow_edit %}
+        {% inline_edit_trans form.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa-regular fa-moon' postSave=postSave disallow_edit=disallow_edit %}
       {% else %}
-        {% inline_edit_trans form.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa fa-file-o' postSave=postSave disallow_edit=disallow_edit %}
+        {% inline_edit_trans form.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa-regular fa-file' postSave=postSave disallow_edit=disallow_edit %}
       {% endif %}
     {% endwith %}
   </div>

diff --git a/corehq/apps/app_manager/templates/app_manager/managed_app.html b/corehq/apps/app_manager/templates/app_manager/managed_app.html
@@ -89,7 +89,7 @@
     <div>
       <div class="pull-left">
         <button type="button" class="popover-additem-option new-module" data-type="survey">
-          <i class="fa fa-file-o"></i> {% trans "Surveys" %}
+          <i class="fa-regular fa-file"></i> {% trans "Surveys" %}
           <p>{% blocktrans %}Collect data once.{% endblocktrans %}</p>
         </button>
       </div>
@@ -126,15 +126,15 @@
       {% if show_shadow_modules %}
         <div class="pull-left">
           <button type="button" class="popover-additem-option new-module" data-type="shadow">
-            <i class="fa fa-moon-o"></i> {% trans "Shadow Menu" %}
+            <i class="fa-regular fa-moon"></i> {% trans "Shadow Menu" %}
             <p>{% blocktrans %}Mimic another menu.{% endblocktrans %}</p>
           </button>
         </div>
       {% endif %}
       {% if show_shadow_module_v1 %}
         <div class="pull-left">
           <button type="button" class="popover-additem-option new-module" data-type="shadow-v1">
-            <i class="fa fa-moon-o"></i> {% trans "Shadow Menu V1" %}
+            <i class="fa-regular fa-moon"></i> {% trans "Shadow Menu V1" %}
             <p>{% blocktrans %}Old style shadow menu with deprecated child behaviour{% endblocktrans %}</p>
           </button>
         </div>
@@ -156,15 +156,15 @@
       <div class="pull-left">
         <button type="button" class="popover-additem-option js-new-form appnav-responsive"
                 data-case-action="none" data-type="survey" data-form-type="form">
-          <i class="fa fa-file-o"></i> {% trans "Survey" %}
+          <i class="fa-regular fa-file"></i> {% trans "Survey" %}
         </button>
       </div>
       <% } %>
       <% if (showTraining) { %>
       <div class="pull-left">
         <button type="button" class="popover-additem-option js-new-form appnav-responsive"
                 data-case-action="none" data-type="lesson" data-form-type="form">
-          <i class="fa fa-file-o"></i> {% trans "Lesson" %}
+          <i class="fa-regular fa-file"></i> {% trans "Lesson" %}
         </button>
       </div>
       <% } %>
@@ -186,15 +186,15 @@
       <div class="pull-left">
         <button type="button" class="popover-additem-option js-new-form appnav-responsive"
                 data-type="advanced" data-form-type="form">
-          <i class="fa fa-file-o"></i> {% trans "Form" %}
+          <i class="fa-regular fa-file"></i> {% trans "Form" %}
         </button>
       </div>
       <% } %>
       <% if (showShadow) { %>
       <div class="pull-left">
         <button type="button" class="popover-additem-option js-new-form appnav-responsive"
                 data-case-action="update" data-type="shadow" data-form-type="shadow">
-          <i class="fa fa-moon-o"></i> {% trans "Shadow Form" %}
+          <i class="fa-regular fa-moon"></i> {% trans "Shadow Form" %}
         </button>
       </div>
       <% } %>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/confirm_delete_app.html b/corehq/apps/app_manager/templates/app_manager/partials/confirm_delete_app.html
@@ -27,7 +27,7 @@ <h4 class="modal-title">
             {% trans "Cancel" %}
           </button>
           <button type="submit" class="disable-on-submit btn btn-danger">
-            <i class="fa fa-trash"></i>
+            <i class="fa-regular fa-trash-can"></i>
             {% trans "Delete" %}
           </button>
         </div>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html b/corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
@@ -5,7 +5,7 @@
 <div class="page-header ko-template" style="margin-top: 0;" id="form-summary-header">
 
   <h3>
-    <i class="fa fa-file-text-o"></i>
+    <i class="fa-regular fa-file-lines"></i>
     {% if page_type == 'form_summary' %}
       {% trans "Form Summary" %} - {% trans "Version" %} <select id="version-selector" class="form-control" data-bind="value: firstAppId"></select>
     {% elif page_type == 'form_diff' %}

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/forms/case_config.html b/corehq/apps/app_manager/templates/app_manager/partials/forms/case_config.html
@@ -224,7 +224,7 @@ <h4 class="panel-title panel-title-nolink form-inline">
                 <a href="#"
                    class="case-action-remove btn btn-purple"
                    data-bind="openModal: 'remove-subcase-modal-template'">
-                  <i class="fa fa-trash"></i>
+                  <i class="fa-regular fa-trash-can"></i>
                 </a>
               {% endif %}
             </div>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_advanced.html b/corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_advanced.html
@@ -152,7 +152,7 @@ <h4 class="panel-title panel-title-nolink">
                 </div>
                 <br />
                 <button class="btn btn-danger" data-bind="click: $parent.removeCaseIndex">
-                  <i class="fa fa-trash"></i>
+                  <i class="fa-regular fa-trash-can"></i>
                   {% trans "Remove parent index" %}
                 </button>
               </div>
@@ -199,7 +199,7 @@ <h4 class="panel-title panel-title-nolink" data-bind="html: header"></h4>
     </a>
     <button class="case-action-remove btn btn-purple"
             data-bind="openModal: 'remove-action-modal-template'">
-      <i class="fa fa-trash"></i>
+      <i class="fa-regular fa-trash-can"></i>
     </button>
   </div>
   <div class="panel-collapse collapse" data-bind="attr: {id: actionType + $index()}">
@@ -322,7 +322,7 @@ <h4 class="panel-title panel-title-nolink" data-bind="html: header"></h4>
     </a>
     <button class="case-action-remove btn btn-purple"
             data-bind="openModal: 'remove-action-modal-template'">
-      <i class="fa fa-trash"></i>
+      <i class="fa-regular fa-trash-can"></i>
     </button>
   </div>
   <div class="panel-collapse collapse" data-bind="attr: {id: actionType + $index()}">
@@ -383,7 +383,7 @@ <h4 class="panel-title panel-title-nolink" data-bind="html: header"></h4>
     </a>
     <button class="case-action-remove btn btn-purple"
             data-bind="openModal: 'remove-action-modal-template'">
-      <i class="fa fa-trash"></i>
+      <i class="fa-regular fa-trash-can"></i>
     </button>
   </div>
   <div class="panel-collapse collapse" data-bind="attr: {id: actionType + $index()}">

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html b/corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
@@ -114,7 +114,7 @@
         id="case-config:case-transaction:case-preload">
   <div class="panel-heading">
     <h4 class="panel-title panel-title-nolink">
-      <i class="fa fa-arrow-right"></i><i class="fa fa-file-o"></i>
+      <i class="fa fa-arrow-right"></i><i class="fa-regular fa-file"></i>
       {% trans "Load the following properties into the form questions" %}
     </h4>
   </div>
@@ -159,7 +159,7 @@ <h4 class="panel-title panel-title-nolink">
                         visible: validateProperty"></p>
         </td>
         <td class="col-sm-1 text-center">
-          <i class="fa fa-arrow-right"></i><i class="fa fa-file-o"></i>
+          <i class="fa fa-arrow-right"></i><i class="fa-regular fa-file"></i>
         </td>
         <td class="col-sm-5">
           <div class="full-width-select2"

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/menu/form_link.html b/corehq/apps/app_manager/templates/app_manager/partials/menu/form_link.html
@@ -7,7 +7,7 @@
     <a href="#form_confirm_delete_{{ module.unique_id }}_{{ form.unique_id }}"
        class="appnav-delete"
        data-toggle="modal">
-        <i class="fa fa-trash-o"></i>
+        <i class="fa-regular fa-trash-can"></i>
     </a>
 
     <a id="view_form_{{ module.unique_id }}_{{ form.unique_id }}_sidebar"
@@ -34,9 +34,9 @@
         {% elif form.get_action_type == 'update' %}
             class="fcc fcc-app-updateform appnav-primary-icon appnav-primary-icon-lg"
         {% elif form.form_type == 'shadow_form' %}
-            class="fa fa-moon-o appnav-primary-icon"
+            class="fa-regular fa-moon appnav-primary-icon"
         {% else %}
-            class="fa fa-file-o appnav-primary-icon"
+            class="fa-regular fa-file appnav-primary-icon"
         {% endif %}
             title="{% if request|toggle_enabled:"SUPPORT" %}{% blocktrans with form.id as index %}This is form {{ index }}<br>{% endblocktrans %} {% endif %}{{ form.get_icon_help_text }}"
             data-toggle="tooltip"
@@ -89,7 +89,7 @@ <h4 class="modal-title">
                 {% trans "Cancel" %}
               </button>
               <button type="submit" class="disable-on-submit btn btn-danger">
-                <i class="fa fa-trash"></i>
+                <i class="fa-regular fa-trash-can"></i>
                 {% trans "Delete Form" %}
               </button>
             </div>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html b/corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
@@ -8,7 +8,7 @@
     <a href="#module_confirm_delete_{{ module.unique_id }}"
        data-toggle="modal"
        class="appnav-delete">
-      <i class="fa fa-trash-o"></i>
+      <i class="fa-regular fa-trash-can"></i>
     </a>
   {% else %}
     <a class="appnav-delete">
@@ -24,7 +24,7 @@
         {% elif module.module_type == 'report' %}
           <i class="fa fa-bar-chart appmanager-icon-type appnav-primary-icon"
         {% elif module.module_type == 'shadow' %}
-          <i class="fa fa-folder-open-o appmanager-icon-type appnav-primary-icon"
+          <i class="fa-regular fa-folder-open appmanager-icon-type appnav-primary-icon"
         {% elif module.is_training_module %}
           <i class="fa fa-book appnav-primary-icon"
         {% elif not module.is_surveys %}
@@ -103,7 +103,7 @@ <h4 class="modal-title">
                 {% trans "Cancel" %}
               </button>
               <button type="submit" class="disable-on-submit btn btn-danger">
-                  <i class="fa fa-trash"></i>
+                  <i class="fa-regular fa-trash-can"></i>
                   {% trans "Delete" %} {{ module.name|html_trans:langs }}
               </button>
             </div>

diff --git a/...hq/apps/app_manager/templates/app_manager/partials/modules/graph_configuration_modal.html b/...hq/apps/app_manager/templates/app_manager/partials/modules/graph_configuration_modal.html
@@ -45,7 +45,7 @@ <h4 class="modal-title" data-bind="text: 'Editing ' + graphDisplayName()"></h4>
                       </div>
                       <div class="col-sm-6">
                         <button class="btn btn-danger pull-right" data-bind="click: $parent.removeSeries">
-                          <i class="fa fa-trash"></i> {% trans "Delete Series" %}
+                          <i class="fa-regular fa-trash-can"></i> {% trans "Delete Series" %}
                         </button>
                         <a href="#" data-bind="
                                                     click: toggleShowDataPath,
@@ -64,7 +64,7 @@ <h4 class="modal-title" data-bind="text: 'Editing ' + graphDisplayName()"></h4>
                                                         <a class="btn btn-default"
                                                            data-bind="click: copyPlaceholder,
                                                                       attr: {'data-clipboard-text': dataPathPlaceholder}">
-                                                            <i class="fa fa-files-o"></i>
+                                                            <i class="fa-regular fa-files"></i>
                                                         </a>
                                                     </span>
                         </div>
@@ -82,7 +82,7 @@ <h4 class="modal-title" data-bind="text: 'Editing ' + graphDisplayName()"></h4>
                                                         <a class="btn btn-default"
                                                            data-bind="click: copyPlaceholder,
                                                                       attr: {'data-clipboard-text': xPlaceholder}">
-                                                            <i class="fa fa-files-o"></i>
+                                                            <i class="fa-regular fa-files"></i>
                                                         </a>
                                                     </span>
                         </div>
@@ -100,7 +100,7 @@ <h4 class="modal-title" data-bind="text: 'Editing ' + graphDisplayName()"></h4>
                                                         <a class="btn btn-default"
                                                            data-bind="click: copyPlaceholder,
                                                                       attr: {'data-clipboard-text': yPlaceholder}">
-                                                            <i class="fa fa-files-o"></i>
+                                                            <i class="fa-regular fa-files"></i>
                                                         </a>
                                                     </span>
                         </div>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/modules/module_view_heading.html b/corehq/apps/app_manager/templates/app_manager/partials/modules/module_view_heading.html
@@ -10,7 +10,7 @@
     {% if module.is_training_module %}
       {% inline_edit_trans module.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa fa-book' postSave=postSave disallow_edit=disallow_edit %}
     {% elif module.module_type == "shadow" %}
-      {% inline_edit_trans module.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa fa-folder-open-o' postSave=postSave disallow_edit=disallow_edit %}
+      {% inline_edit_trans module.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa-regular fa-folder-open' postSave=postSave disallow_edit=disallow_edit %}
     {% elif module.module_type == "report" %}
       {% inline_edit_trans module.name langs edit_name_url saveValueName='name' containerClass='h3' iconClass='fa fa-bar-chart' postSave=postSave disallow_edit=disallow_edit %}
     {% elif module.module_type == "advanced" %}

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html b/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
@@ -262,7 +262,7 @@ <h4 class="panel-title">
                      data-action="Deploy Type"
                      data-label="View Source Files"
                      data-bind="attr: {href: $root.reverse('download_index', id)}">
-                    <i class="fa fa-file-text-o"></i>
+                    <i class="fa-regular fa-file-lines"></i>
                     {% trans 'View Source Files' %}
                   </a>
                 </h4>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html b/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
@@ -45,7 +45,7 @@
     {% endif %}
     {% if user.is_superuser %}
       <a class="btn btn-default" href="{% url "app_build_timings" %}?app_id={{ app.id }}" target="_blank">
-        <i class="fa fa-clock-o"></i>
+        <i class="fa-regular fa-clock"></i>
         {% trans "Timing" %}
       </a>
     {% endif %}
@@ -128,7 +128,7 @@
                data-bind="openModal: 'delete-build-modal-template',
                                   visible: !_deleteState(),
                                   css: {hide: false}">
-              <i class="fa fa-trash"></i>
+              <i class="fa-regular fa-trash-can"></i>
             </a>
             <div class="pending hide" data-bind="visible: _deleteState() == 'pending', css: {hide: false}">
               <i class="fa fa-spin fa-spinner"></i>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html b/corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
@@ -86,7 +86,7 @@
     </div>
     <div class="col-sm-1">
       <button class="btn btn-danger" data-bind="click: $parent.onDestroyCustomProperty">
-        <i class="fa fa-trash"></i>
+        <i class="fa-regular fa-trash-can"></i>
       </button>
     </div>
   </div>
@@ -317,7 +317,7 @@ <h6>Example:</h6>
         <legend>{% trans "Delete Application" %}</legend>
         <div class="panel-body">
           <a href="#delete-app-modal" class="btn btn-danger" data-toggle="modal">
-            <i class="fa fa-trash"></i>
+            <i class="fa-regular fa-trash-can"></i>
             {% trans "Delete this application" %}
           </a>
         </div>

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html b/corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
@@ -26,7 +26,7 @@
       <a href="#" data-bind="click: $root.setAsDefault, visible: !isDefaultLang()" class="btn btn-default">{% trans "Set as default" %}</a>
     </td>
     <td class="col-sm-1">
-      <a href="#" data-bind="click: $root.removeLanguage" class="btn btn-danger"><i class="fa fa-trash-o"></i></a>
+      <a href="#" data-bind="click: $root.removeLanguage" class="btn btn-danger"><i class="fa-regular fa-trash-can"></i></a>
     </td>
   </tr>
   </tbody>