userfrosting · lcharette · Jul 17, 2019 · Apr 1, 2019 · Apr 1, 2019 · Apr 1, 2019
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php b/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
@@ -34,7 +34,7 @@ public function up()
                 $table->string('slug');
                 $table->string('name');
                 $table->text('description')->nullable();
-                $table->string('icon', 100)->nullable(false)->default('fa fa-user')->comment('The icon representing users in this group.');
+                $table->string('icon', 100)->nullable(false)->default('fas fa-user')->comment('The icon representing users in this group.');
                 $table->timestamps();
 
                 $table->engine = 'InnoDB';

diff --git a/app/sprinkles/account/templates/forms/settings-account.html.twig b/app/sprinkles/account/templates/forms/settings-account.html.twig
@@ -1,6 +1,6 @@
 <form id="account-settings" role="form" action="{{site.uri.public}}/account/settings" method="post">
     <div class="box-header">
-        <h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
+        <h3 class="box-title"><i class="fas fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
     </div>
     <div class="box-body">
         {% include "forms/csrf.html.twig" %}

diff --git a/app/sprinkles/account/templates/forms/settings-profile.html.twig b/app/sprinkles/account/templates/forms/settings-profile.html.twig
@@ -1,6 +1,6 @@
 <form id="profile-settings" role="form" action="{{site.uri.public}}/account/settings/profile" method="post">
     <div class="box-header">
-        <h3 class="box-title"><i class="fa fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
+        <h3 class="box-title"><i class="fas fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
     </div>
     <div class="box-body">
         {% include "forms/csrf.html.twig" %}

diff --git a/app/sprinkles/account/templates/navigation/user-card.html.twig b/app/sprinkles/account/templates/navigation/user-card.html.twig
@@ -4,7 +4,7 @@
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
       <img src="{{ current_user.avatar }}" class="user-image" alt="User Image">
       <span class="hidden-xs">{{current_user.first_name}} {{current_user.last_name}}</span>
-      <i class="fa fa-chevron-down"></i>
+      <i class="fas fa-chevron-down"></i>
     </a>
     {% endblock %}
     <ul class="dropdown-menu">

diff --git a/app/sprinkles/account/templates/pages/error/compromised.html.twig b/app/sprinkles/account/templates/pages/error/compromised.html.twig
@@ -5,7 +5,7 @@
 {% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
 
 {% block heading %}
-    <i class="fa fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
+    <i class="fas fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
         'url' : site.uri.public ~ '/account/sign-in'
     }) | raw }}
 {% endblock %}
diff --git a/app/sprinkles/admin/src/Controller/GroupController.php b/app/sprinkles/admin/src/Controller/GroupController.php
@@ -383,7 +383,7 @@ public function getModalCreate(Request $request, Response $response, $args)
         // Create a dummy group to prepopulate fields
         $group = $classMapper->createInstance('group', []);
 
-        $group->icon = 'fa fa-user';
+        $group->icon = 'fas fa-user';
 
         $fieldNames = ['name', 'slug', 'icon', 'description'];
         $fields = [

diff --git a/app/sprinkles/admin/templates/forms/group.html.twig b/app/sprinkles/admin/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="fa fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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="fa fa-tag fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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/sprinkles/admin/templates/forms/role.html.twig b/app/sprinkles/admin/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="fa fa-edit fa-fw"></i></span>
+                    <span class="input-group-addon"><i class="fas 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="fa fa-tag fa-fw"></i></span>
+                    <span class="input-group-addon"><i class="fas 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/sprinkles/admin/templates/forms/user.html.twig b/app/sprinkles/admin/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="fa fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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="fa fa-users fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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 %}
@@ -39,7 +39,7 @@
                 <div class="form-group">
                     <label>{{translate('FIRST_NAME')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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>
@@ -48,7 +48,7 @@
                 <div class="form-group">
                     <label>{{translate('LAST_NAME')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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>
@@ -59,11 +59,11 @@
                 <div class="form-group">
                     <label>{{translate('EMAIL')}}</label>
                     <div class="input-group js-copy-container">
-                        <span class="input-group-addon"><i class="fa fa-envelope fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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="fa fa-clipboard"></i></button>
+                                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
                             </span>
                         {% endif %}
                     </div>
@@ -75,7 +75,7 @@
                 <div class="form-group">
                     <label for="input-theme">{{translate('THEME')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-puzzle-piece fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas fa-puzzle-piece fa-fw"></i></span>
                         {% if 'theme' in form.fields.disabled %}
                             <input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled>
                         {% else %}
@@ -94,7 +94,7 @@
                 <div class="form-group">
                     <label for="input-locale">{{translate('LOCALE')}}</label>
                     <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-language fa-fw"></i></span>
+                        <span class="input-group-addon"><i class="fas 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/sprinkles/admin/templates/modals/role-manage-permissions.html.twig b/app/sprinkles/admin/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="fa fa-trash"></i> </button>
+            <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fas fa-trash"></i> </button>
         </td>
     </tr>
 </script>

diff --git a/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig b/app/sprinkles/admin/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="fa fa-trash"></i> </button>
+            <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fas fa-trash"></i> </button>
         </td>
     </tr>
 </script>

diff --git a/app/sprinkles/admin/templates/modals/user-set-password.html.twig b/app/sprinkles/admin/templates/modals/user-set-password.html.twig
@@ -31,14 +31,14 @@
                     <div class="form-group">
                         <label>{{translate('PASSWORD')}}</label>
                         <div class="input-group">
-                            <span class="input-group-addon"><i class="fa fa-key"></i></span>
+                            <span class="input-group-addon"><i class="fas fa-key"></i></span>
                             <input type="password" class="form-control" name="value" autocomplete="off" value="" placeholder="{{translate("PASSWORD.BETWEEN", {min: 12, max: 50})}}">
                         </div>
                     </div>
                     <div class="form-group">
                         <label>{{translate('PASSWORD.CONFIRM')}}</label>
                         <div class="input-group">
-                            <span class="input-group-addon"><i class="fa fa-key"></i></span>
+                            <span class="input-group-addon"><i class="fas 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/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig
@@ -1,12 +1,12 @@
 {% block navigation %}
     {% if checkAccess('uri_dashboard') %}
     <li>
-        <a href="{{site.uri.public}}/dashboard"><i class="fa fa-dashboard fa-fw"></i> <span>{{ translate("DASHBOARD") }}</span></a>
+        <a href="{{site.uri.public}}/dashboard"><i class="fas fa-tachometer-alt fa-fw"></i> <span>{{ translate("DASHBOARD") }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_users') %}
     <li>
-        <a href="{{site.uri.public}}/users"><i class="fa fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
+        <a href="{{site.uri.public}}/users"><i class="fas fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
     </li>
     {% elseif checkAccess('uri_group', {
         'group': current_user.group
@@ -17,22 +17,22 @@
     {% endif %}
     {% if checkAccess('uri_activities') %}
     <li>
-        <a href="{{site.uri.public}}/activities"><i class="fa fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
+        <a href="{{site.uri.public}}/activities"><i class="fas fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_roles') %}
     <li>
-        <a href="{{site.uri.public}}/roles"><i class="fa fa-drivers-license fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
+        <a href="{{site.uri.public}}/roles"><i class="fas fa-id-card fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_permissions') %}
     <li>
-        <a href="{{site.uri.public}}/permissions"><i class="fa fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
+        <a href="{{site.uri.public}}/permissions"><i class="fas fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
     </li>
     {% endif %}
     {% if checkAccess('uri_groups') %}
     <li>
-        <a href="{{site.uri.public}}/groups"><i class="fa fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
+        <a href="{{site.uri.public}}/groups"><i class="fas fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
     </li>
     {% endif %}
-{% endblock %}
+{% endblock %}
diff --git a/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig b/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig
@@ -30,7 +30,7 @@
         <!-- Logo -->
         {% block navbar_logo %}
         <a href="{{site.uri.public}}" class="logo">
-            <i class="fa fa-home"></i>
+            <i class="fas fa-home"></i>
             {{site.title}}
         </a>
         {% endblock %}
@@ -84,4 +84,4 @@
 
 {% block scripts_page_group %}
     {{ assets.js('js/admin') | raw }}
-{% endblock %}
+{% endblock %}
diff --git a/app/sprinkles/admin/templates/pages/activities.html.twig b/app/sprinkles/admin/templates/pages/activities.html.twig
@@ -15,7 +15,7 @@
         <div class="col-md-12">
             <div id="widget-activities" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fa fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
+                    <h3 class="box-title"><i class="fas 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/sprinkles/admin/templates/pages/dashboard.html.twig b/app/sprinkles/admin/templates/pages/dashboard.html.twig
@@ -11,7 +11,7 @@
         <div class="col-md-4 col-sm-6 col-xs-12">
           <a href="{{site.uri.public}}/users">
             <div class="info-box">
-              <span class="info-box-icon bg-aqua"><i class="fa fa-user fa-fw"></i></span>
+              <span class="info-box-icon bg-aqua"><i class="fas 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="{{site.uri.public}}/roles">
             <div class="info-box">
-              <span class="info-box-icon bg-red"><i class="fa fa-drivers-license"></i></span>
+              <span class="info-box-icon bg-red"><i class="fas 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="{{site.uri.public}}/groups">
             <div class="info-box">
-              <span class="info-box-icon bg-green"><i class="fa fa-users"></i></span>
+              <span class="info-box-icon bg-green"><i class="fas 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="fa fa-user fa-fw"></i></span>
+            <span class="info-box-icon bg-aqua"><i class="fas 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>
@@ -187,7 +187,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="fa fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
+                    <h3 class="box-title"><i class="fas fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">
@@ -208,7 +208,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="fa fa-fw fa-user"></i> {{translate('USER', 2)}}</h3>
+                    <h3 class="box-title"><i class="fas fa-fw fa-user"></i> {{translate('USER', 2)}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">
@@ -221,7 +221,7 @@
                 </div>
                 <div class="box-footer">
                     <button type="button" class="btn btn-success js-user-create">
-                        <i class="fa fa-plus-square"></i>  {{translate("USER.CREATE")}}
+                        <i class="fas fa-plus-square"></i>  {{translate("USER.CREATE")}}
                     </button>
                 </div>
             </div>
@@ -279,4 +279,4 @@
     <!-- Include page-specific JS -->
     {{ assets.js('js/pages/dashboard') | raw }}
 
-{% endblock %}
+{% endblock %}
-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="fa fa-trash"></i> </button>
+                <button type="button" class="btn btn-link btn-trash js-delete-row pull-right" title="Delete"> <i class="fas fa-trash"></i> </button>
             </td>
         </tr>
     </script>
@@ Expand Down @@