Update FontAwesome

userfrosting · Feb 28, 2024 · 0feeb80 · 0feeb80
1 parent cc2579f
commit 0feeb80
Show file tree

Hide file tree

Showing 26 changed files with 705 additions and 661 deletions.
diff --git a/app/src/Controller/Group/GroupCreateModal.php b/app/src/Controller/Group/GroupCreateModal.php
@@ -40,7 +40,7 @@ class GroupCreateModal
     protected string $schema = 'schema://requests/group/create.yaml';
 
     // Default group icon
-    protected string $defaultIcon = 'fas fa-user';
+    protected string $defaultIcon = 'fa-solid fa-user';
 
     /**
      * Inject dependencies.

diff --git a/app/templates/forms/group.html.twig b/app/templates/forms/group.html.twig
@@ -9,7 +9,7 @@
                 <div class="form-group">
                     <label>{{translate("GROUP.NAME")}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-edit fa-fw"></i></span>
                         <input type="text" class="form-control" name="name" autocomplete="off" value="{{group.name}}" placeholder="{{translate("GROUP.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
                     </div>
                 </div>
@@ -20,7 +20,7 @@
                 <div class="form-group">
                     <label>{{translate("SLUG")}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-tag fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-tag fa-fw"></i></span>
                         <input type="text" class="form-control" name="slug" autocomplete="off" value="{{group.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly>
                         {% if 'slug' not in form.fields.disabled %}
                             <span class="input-group-btn" data-toggle="buttons">

diff --git a/app/templates/forms/partials/user-set-password.html.twig b/app/templates/forms/partials/user-set-password.html.twig
@@ -21,14 +21,14 @@
             <div class="form-group">
                 <label>{{translate('PASSWORD')}}</label>
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                    <span class="input-group-addon"><i class="fa-solid fa-key"></i></span>
                     <input type="password" class="form-control" name="password" autocomplete="off" value="" placeholder="{{translate('PASSWORD.BETWEEN', {min: site.password.length.min, max: site.password.length.max})}}">
                 </div>
             </div>
             <div class="form-group">
                 <label>{{translate('PASSWORD.CONFIRM')}}</label>
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                    <span class="input-group-addon"><i class="fa-solid fa-key"></i></span>
                     <input type="password" class="form-control" name="passwordc" autocomplete="off" value="" placeholder="{{translate('PASSWORD.CONFIRM')}}">
                 </div>
             </div>

diff --git a/app/templates/forms/role.html.twig b/app/templates/forms/role.html.twig
@@ -8,7 +8,7 @@
             <div class="form-group">
                 <label>{{translate("ROLE.NAME")}}</label>
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                    <span class="input-group-addon"><i class="fa-solid fa-edit fa-fw"></i></span>
                     <input type="text" class="form-control" name="name" autocomplete="off" value="{{role.name}}" placeholder="{{translate("ROLE.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
                 </div>
             </div>
@@ -19,7 +19,7 @@
             <div class="form-group">
                 <label>{{translate("SLUG")}}</label>
                 <div class="input-group">
-                    <span class="input-group-addon"><i class="fas fa-tag fa-fw"></i></span>
+                    <span class="input-group-addon"><i class="fa-solid fa-tag fa-fw"></i></span>
                     <input type="text" class="form-control" name="slug" autocomplete="off" value="{{role.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly>
                     {% if 'slug' not in form.fields.disabled %}
                         <span class="input-group-btn" data-toggle="buttons">

diff --git a/app/templates/forms/user.html.twig b/app/templates/forms/user.html.twig
@@ -9,7 +9,7 @@
                 <div class="form-group">
                     <label>{{translate('USERNAME')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-edit fa-fw"></i></span>
                         <input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
                     </div>
                 </div>
@@ -20,7 +20,7 @@
                 <div class="form-group">
                     <label for="input-group">{{translate('GROUP')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-users fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-users fa-fw"></i></span>
                         {% if 'group' in form.fields.disabled %}
                             <input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
                         {% else %}
@@ -41,7 +41,7 @@
                 <div class="form-group">
                     <label>{{translate('FIRST_NAME')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-edit fa-fw"></i></span>
                         <input type="text" class="form-control" name="first_name" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
                     </div>
                 </div>
@@ -50,7 +50,7 @@
                 <div class="form-group">
                     <label>{{translate('LAST_NAME')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-edit fa-fw"></i></span>
                         <input type="text" class="form-control" name="last_name" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
                     </div>
                 </div>
@@ -61,11 +61,11 @@
                 <div class="form-group">
                     <label>{{translate('EMAIL')}}</label>
                     <div class="input-group js-copy-container">
-                        <span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-envelope fa-fw"></i></span>
                         <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}>
                         {% if 'email' in form.fields.disabled %}
                             <span class="input-group-btn">
-                                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
+                                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fa-solid fa-clipboard"></i></button>
                             </span>
                         {% endif %}
                     </div>
@@ -77,7 +77,7 @@
                 <div class="form-group">
                     <label for="input-locale">{{translate('LOCALE')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fas fa-language fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fa-solid fa-language fa-fw"></i></span>
                         {% if 'locale' in form.fields.disabled %}
                             <input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled>
                         {% else %}

diff --git a/app/templates/modals/role-manage-permissions.html.twig b/app/templates/modals/role-manage-permissions.html.twig
@@ -81,7 +81,7 @@
             </div>
         </td>
         <td>
-            <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fas fa-trash"></i> </button>
+            <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fa-solid fa-trash"></i> </button>
         </td>
     </tr>
 </script>

diff --git a/app/templates/modals/user-manage-roles.html.twig b/app/templates/modals/user-manage-roles.html.twig
@@ -64,7 +64,7 @@
             {{description}}
         </td>
         <td>
-            <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fas fa-trash"></i> </button>
+            <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fa-solid fa-trash"></i> </button>
         </td>
     </tr>
 </script>

diff --git a/app/templates/navigation/sidebar-menu.html.twig b/app/templates/navigation/sidebar-menu.html.twig
@@ -1,38 +1,38 @@
 {% block navigation %}
     {% if checkAccess('uri_dashboard') %}
     <li>
-        <a href="{{ urlFor('dashboard') }}"><i class="fas fa-tachometer-alt fa-fw"></i> <span>{{ translate("DASHBOARD") }}</span></a>
+        <a href="{{ urlFor('dashboard') }}"><i class="fa-solid fa-tachometer-alt fa-fw"></i> <span>{{ translate("DASHBOARD") }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_users') %}
     <li>
-        <a href="{{ urlFor('uri_users') }}"><i class="fas fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
+        <a href="{{ urlFor('uri_users') }}"><i class="fa-solid fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
     </li>
     {% elseif checkAccess('uri_group', {
         'group': current_user.group
     }) %}
     <li>
-        <a href="{{ urlFor('page.group', {'slug': current_user.group.slug}) }}"><i class="fas {{current_user.group.icon}} fa-fw"></i> <span>{{ translate("GROUP.MANAGE") }}</span></a>
+        <a href="{{ urlFor('page.group', {'slug': current_user.group.slug}) }}"><i class="fa-solid {{current_user.group.icon}} fa-fw"></i> <span>{{ translate("GROUP.MANAGE") }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_activities') %}
     <li>
-        <a href="{{ urlFor('uri_activities') }}"><i class="fas fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
+        <a href="{{ urlFor('uri_activities') }}"><i class="fa-solid fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_roles') %}
     <li>
-        <a href="{{ urlFor('uri_roles') }}"><i class="fas fa-id-card fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
+        <a href="{{ urlFor('uri_roles') }}"><i class="fa-solid fa-id-card fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_permissions') %}
     <li>
-        <a href="{{ urlFor('uri_permissions') }}"><i class="fas fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
+        <a href="{{ urlFor('uri_permissions') }}"><i class="fa-solid fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_groups') %}
     <li>
-        <a href="{{ urlFor('uri_groups') }}"><i class="fas fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
+        <a href="{{ urlFor('uri_groups') }}"><i class="fa-solid fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
     </li>
     {% endif %}
 {% endblock %}
diff --git a/app/templates/pages/abstract/dashboard.html.twig b/app/templates/pages/abstract/dashboard.html.twig
@@ -29,7 +29,7 @@
         <!-- Logo -->
         {% block navbar_logo %}
         <a href="{{ urlFor('index', [], [], '/') }}" class="logo">
-            <i class="fas fa-home"></i>
+            <i class="fa-solid fa-home"></i>
             {{site.title}}
         </a>
         {% endblock %}

diff --git a/app/templates/pages/activities.html.twig b/app/templates/pages/activities.html.twig
@@ -10,7 +10,7 @@
         <div class="col-md-12">
             <div id="widget-activities" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
+                    <h3 class="box-title"><i class="fa-solid fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">

diff --git a/app/templates/pages/dashboard.html.twig b/app/templates/pages/dashboard.html.twig
@@ -11,7 +11,7 @@
         <div class="col-md-4 col-sm-6 col-xs-12">
           <a href="{{ urlFor('uri_users') }}">
             <div class="info-box">
-              <span class="info-box-icon bg-aqua"><i class="fas fa-user fa-fw"></i></span>
+              <span class="info-box-icon bg-aqua"><i class="fa-solid fa-user fa-fw"></i></span>
               <div class="info-box-content">
                 <span class="info-box-text">{{ translate("USER", 2) }}</span>
                 <span class="info-box-number">{{counter.users}}</span>
@@ -26,7 +26,7 @@
         <div class="col-md-4 col-sm-6 col-xs-12">
           <a href="{{ urlFor('uri_roles') }}">
             <div class="info-box">
-              <span class="info-box-icon bg-red"><i class="fas fa-id-card"></i></span>
+              <span class="info-box-icon bg-red"><i class="fa-solid fa-id-card"></i></span>
               <div class="info-box-content">
                 <span class="info-box-text">{{ translate("ROLE", 2) }}</span>
                 <span class="info-box-number">{{counter.roles}}</span>
@@ -41,7 +41,7 @@
         <div class="col-md-4 col-sm-6 col-xs-12">
           <a href="{{ urlFor('uri_groups') }}">
             <div class="info-box">
-              <span class="info-box-icon bg-green"><i class="fas fa-users"></i></span>
+              <span class="info-box-icon bg-green"><i class="fa-solid fa-users"></i></span>
               <div class="info-box-content">
                 <span class="info-box-text">{{ translate("GROUP", 2) }}</span>
                 <span class="info-box-number">{{counter.groups}}</span>
@@ -72,7 +72,7 @@
         <!-- /.col -->
         <div class="col-sm-6 col-xs-12">
           <div class="info-box">
-            <span class="info-box-icon bg-aqua"><i class="fas fa-user fa-fw"></i></span>
+            <span class="info-box-icon bg-aqua"><i class="fa-solid fa-user fa-fw"></i></span>
             <div class="info-box-content">
               <span class="info-box-text">{{ translate("USER", 2) }}</span>
               <span class="info-box-number">{{current_user.group.users.count}}</span>
@@ -196,7 +196,7 @@
         <div class="col-md-6 col-sm-12 col-xs-12">
             <div id="widget-activities" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
+                    <h3 class="box-title"><i class="fa-solid fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">
@@ -217,7 +217,7 @@
         <div class="col-md-6 col-sm-12 col-xs-12">
             <div id="widget-group-users" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-fw fa-user"></i> {{translate('USER', 2)}}</h3>
+                    <h3 class="box-title"><i class="fa-solid fa-fw fa-user"></i> {{translate('USER', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">
@@ -230,7 +230,7 @@
                 </div>
                 <div class="box-footer">
                     <button type="button" class="btn btn-success js-user-create">
-                        <i class="fas fa-plus-square"></i>  {{translate("USER.CREATE")}}
+                        <i class="fa-solid fa-plus-square"></i>  {{translate("USER.CREATE")}}
                     </button>
                 </div>
             </div>

diff --git a/app/templates/pages/group.html.twig b/app/templates/pages/group.html.twig
@@ -20,19 +20,19 @@
                         <div class="box-tools pull-right">
                             <div class="btn-group">
                                 <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                  <i class="fas fa-cog"></i> <span class="caret"></span>
+                                  <i class="fa-solid fa-cog"></i> <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu box-tool-menu">
                                     {% block tools %}
                                         <li>
                                             <a href="#" class="js-group-edit" data-slug="{{group.slug}}">
-                                                <i class="fas fa-edit fa-fw"></i> {{translate('EDIT')}}
+                                                <i class="fa-solid fa-edit fa-fw"></i> {{translate('EDIT')}}
                                             </a>
                                         </li>
                                         {% if 'delete' not in tools.hidden %}
                                             <li>
                                                 <a href="#" class="js-group-delete" data-slug="{{group.slug}}">
-                                                    <i class="fas fa-trash-alt fa-fw"></i> {{translate('DELETE')}}
+                                                    <i class="fa-solid fa-trash-alt fa-fw"></i> {{translate('DELETE')}}
                                                 </a>
                                             </li>
                                         {% endif %}
@@ -56,7 +56,7 @@
                     {% endif %}
                     {% if 'users' not in fields.hidden %}
                         <hr>
-                        <strong><i class="fas fa-users margin-r-5"></i> {{ translate('USER', 2)}}</strong>
+                        <strong><i class="fa-solid fa-users margin-r-5"></i> {{ translate('USER', 2)}}</strong>
                         <p class="badge bg-blue box-profile-property">
                             {{group.users.count}}
                         </p>
@@ -68,7 +68,7 @@
         <div class="col-lg-8">
             <div id="widget-group-users" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-fw fa-user"></i> {{translate('USER', 2)}}</h3>
+                    <h3 class="box-title"><i class="fa-solid fa-fw fa-user"></i> {{translate('USER', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">

diff --git a/app/templates/pages/groups.html.twig b/app/templates/pages/groups.html.twig
@@ -15,7 +15,7 @@
         <div class="col-md-12">
             <div id="widget-groups" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-fw fa-users"></i> {{translate('GROUP', 2)}}</h3>
+                    <h3 class="box-title"><i class="fa-solid fa-fw fa-users"></i> {{translate('GROUP', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">
@@ -29,7 +29,7 @@
                 {% if checkAccess('create_group') %}
                 <div class="box-footer">
                     <button type="button" class="btn btn-success js-group-create">
-                        <i class="fas fa-plus-square"></i>  {{translate("GROUP.CREATE")}}
+                        <i class="fa-solid fa-plus-square"></i>  {{translate("GROUP.CREATE")}}
                     </button>
                 </div>
                 {% endif %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ @@
                 </div>
             </td>
             <td>
-                <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fas fa-trash"></i> </button>
+                <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fa-solid fa-trash"></i> </button>
             </td>
         </tr>
     </script>
@@ Expand Down @@