chore(icons): migrate to Font Awesome 7 names, and fix the ones that never fit

capone/config/plugin.config.php

@@ -22,7 +22,7 @@
 $fog_plugin = [];
 $fog_plugin['name'] = 'capone';
 $fog_plugin['description'] = 'Capone is an automation plugin for fog.';
-$fog_plugin['menuicon'] = 'fa fa-magic fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-wand-magic-sparkles fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

capone/hooks/addcaponemenuitem.hook.php

@@ -87,7 +87,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Capone'), 'fa fa-magic'];
+            = [_('Capone'), 'fas fa-wand-magic-sparkles'];
     }
     /**
      * Adds the capone page to search elements.

helloworld/config/plugin.config.php

@@ -27,7 +27,7 @@
     . 'plugin structure (config, model, manager, page, hooks, JS).';
 // A font-awesome class ("fa ...") is rendered as an icon; anything else is
 // treated as an <img> src.
-$fog_plugin['menuicon'] = 'fa fa-cube fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-flask fa-fw';
 // Your plugin's own version. Shown in Plugin Management and written to
 // plugins.pVersion, so "which build is installed here" has an answer. Nothing
 // compares it to anything -- it is yours to number as you like.

helloworld/hooks/addhelloworldmenuitem.hook.php

@@ -75,7 +75,7 @@ public function __construct()
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Hello World'), 'fa fa-cube'];
+            = [_('Hello World'), 'fas fa-flask'];
     }
     /**
      * Registers the page as searchable.

ldap/config/plugin.config.php

@@ -26,7 +26,7 @@
     . 'server.  This can be done typically by using your distros package '
     . 'manager software.  (e.g. apt-get install php5-ldap, '
     . 'yum install php-ldap)';
-$fog_plugin['menuicon'] = 'fa fa-key fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-address-book fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

ldap/hooks/addldapmenuitem.hook.php

@@ -108,13 +108,13 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('LDAP Servers'), 'fa fa-key'];
+            = [_('LDAP Servers'), 'fas fa-address-book'];
         // Groups get their own node because granting a role or a user group
         // is an ordinary association, and the shared association tab needs
         // the group itself to be the owning object. See
         // LDAPGroupManagement.
         $arguments['hook_main'][self::GROUP_NODE]
-            = [_('LDAP Groups'), 'fa fa-users'];
+            = [_('LDAP Groups'), 'fas fa-users'];
     }
     /**
      * Adds the plugin page to the search page lists

location/config/plugin.config.php

@@ -32,7 +32,7 @@
     _('sites with clients moving back and forth'),
     _('between different sites')
 );
-$fog_plugin['menuicon'] = 'fa fa-globe fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-location-dot fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott, Lee Rowlett';

location/hooks/addlocationmenuitem.hook.php

@@ -88,7 +88,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Locations'), 'fa fa-globe'];
+            = [_('Locations'), 'fas fa-location-dot'];
         // Existence check goes through the cached settings reader, not a raw
         // Setting->load(). This hook only ever needs to know whether the row
         // has been seeded yet, but it fired on every main-menu build -- which

location/js/fog.location.list.js

@@ -18,8 +18,8 @@
             },
             {
                 render: function(data, type, row) {
-                    var enabled = '<span class="badge bg-success"><i class="fa fa-check-circle"></i></span>',
-                        disabled = '<span class="badge bg-danger"><i class="fa fa-times-circle"></i></span>';
+                    var enabled = '<span class="badge bg-success"><i class="fas fa-circle-check"></i></span>',
+                        disabled = '<span class="badge bg-danger"><i class="fas fa-circle-xmark"></i></span>';
                     if (row.tftp > 0) {
                         return enabled;
                     }

ntfy/config/plugin.config.php

@@ -25,7 +25,7 @@
 $fog_plugin['name'] = 'ntfy';
 $fog_plugin['description'] = 'Adds ntfy notifications using either the '
     . 'ntfy.sh default server or a self-hosted server.';
-$fog_plugin['menuicon'] = 'fa fa-comment fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-tower-broadcast fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tony Lam, Tom Elliott';

ntfy/hooks/addntfymenuitem.hook.php

@@ -72,7 +72,7 @@ public function __construct()
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('ntfy Accounts'), 'fa fa-comment'];
+            = [_('ntfy Accounts'), 'fas fa-tower-broadcast'];
     }
     /**
      * Adds the ntfy page to objects elements.

oidc/class/oidcmanager.class.php

@@ -144,7 +144,7 @@ public function createSql()
                 // once. management/login.php (fogproject#1175) is the way
                 // back, and the management page names it next to the box.
                 "'0'",
-                "'fa fa-id-badge'"
+                "'far fa-id-badge'"
             ],
             [
                 // No UNIQUE index on opName. FOGController::save() issues an

oidc/config/plugin.config.php

@@ -26,7 +26,7 @@
     . 'plugin nothing types a password into FOG: the browser is redirected '
     . 'to the provider and comes back with a signed token. Local password '
     . 'login always remains available.';
-$fog_plugin['menuicon'] = 'fa fa-id-badge fa-fw';
+$fog_plugin['menuicon'] = 'far fa-id-badge fa-fw';
 $fog_plugin['version'] = '1.6.0';
 // The extension points this plugin is built on -- plugin API routes, the
 // login-page provider hook, and establishSession() provenance -- landed

oidc/hooks/addoidcmenuitem.hook.php

@@ -101,12 +101,12 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('OpenID Connect'), 'fa fa-id-badge'];
+            = [_('OpenID Connect'), 'far fa-id-badge'];
         // Groups get their own node because granting a role or a user group
         // is an ordinary association, and the shared association tab needs
         // the group itself to be the owning object. See OIDCGroupManagement.
         $arguments['hook_main'][self::GROUP_NODE]
-            = [_('OpenID Connect Groups'), 'fa fa-users'];
+            = [_('OpenID Connect Groups'), 'fas fa-users'];
     }
     /**
      * Adds the plugin page to the search page lists.

oidc/js/fog.oidc.list.js

@@ -26,9 +26,9 @@
             {
                 render: function(data, type, row) {
                     var on = '<span class="badge bg-success">'
-                        + '<i class="fa fa-check-circle"></i></span>';
+                        + '<i class="fas fa-circle-check"></i></span>';
                     var off = '<span class="badge bg-secondary">'
-                        + '<i class="fa fa-times-circle"></i></span>';
+                        + '<i class="fas fa-circle-xmark"></i></span>';
                     return row.enabled > 0 ? on : off;
                 },
                 targets: 2

oidc/pages/oidcmanagement.page.php

@@ -172,10 +172,10 @@ protected function _addFields()
             => self::makeInput(
                 'form-control oidcicon-input',
                 'icon',
-                'fa fa-id-badge',
+                'far fa-id-badge',
                 'text',
                 'icon',
-                $icon ?: 'fa fa-id-badge'
+                $icon ?: 'far fa-id-badge'
             ),
             self::makeLabel(
                 $this->_labelClass,
@@ -399,7 +399,7 @@ public function oidcGeneral()
             => self::makeInput(
                 'form-control oidcicon-input',
                 'icon',
-                'fa fa-id-badge',
+                'far fa-id-badge',
                 'text',
                 'icon',
                 $get('icon')

ou/config/plugin.config.php

@@ -25,7 +25,7 @@
     'OU is a plugin that allows you to predefine OU\'s and associate '
     . 'with hosts.'
 );
-$fog_plugin['menuicon'] = 'fa fa-bullseye fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-folder-tree fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

ou/hooks/addoumenuitem.hook.php

@@ -88,7 +88,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('OUs'), 'fa fa-bullseye'];
+            = [_('OUs'), 'fas fa-folder-tree'];
     }
     /**
      * Adds the ou page to search elements.

persistentgroups/config/plugin.config.php

@@ -22,7 +22,7 @@
 $fog_plugin = [];
 $fog_plugin['name'] = 'persistentgroups';
 $fog_plugin['description'] = 'Enable persistent groups.';
-$fog_plugin['menuicon'] = 'fa fa-id-card fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-layer-group fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

pushbullet/config/plugin.config.php

@@ -24,7 +24,7 @@
 $fog_plugin = [];
 $fog_plugin['name'] = 'pushbullet';
 $fog_plugin['description'] = 'Adds pushbullet notifications.';
-$fog_plugin['menuicon'] = 'fa fa-bell fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-bell fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott, Joe Schmitt';

pushbullet/hooks/addpushbulletmenuitem.hook.php

@@ -72,7 +72,7 @@ public function __construct()
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Pushbullet Accounts'), 'fa fa-bell'];
+            = [_('Pushbullet Accounts'), 'fas fa-bell'];
     }
     /**
      * Adds the pushbullet page to objects elements.

slack/config/plugin.config.php

@@ -22,7 +22,7 @@
 $fog_plugin = [];
 $fog_plugin['name'] = 'slack';
 $fog_plugin['description'] = 'Adds slack-api integration.';
-$fog_plugin['menuicon'] = 'fa fa-slack fa-fw';
+$fog_plugin['menuicon'] = 'fab fa-slack fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

slack/hooks/addslackmenuitem.hook.php

@@ -70,7 +70,7 @@ public function __construct()
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Slack Accounts'), 'fa fa-slack'];
+            = [_('Slack Accounts'), 'fab fa-slack'];
     }
     /**
      * Adds the location page to search elements.

subnetgroup/config/plugin.config.php

@@ -25,7 +25,7 @@
 $fog_plugin['name'] = 'subnetgroup';
 $fog_plugin['description'] = 'Associates host groups with IP subnets'
     . ' in order to automatically assign hosts according to their IP address';
-$fog_plugin['menuicon'] = 'fa fa-wifi fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-network-wired fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott, sctt';

subnetgroup/hooks/addsubnetgroupmenuitem.hook.php

@@ -88,7 +88,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Subnet Groups'), 'fa fa-wifi'];
+            = [_('Subnet Groups'), 'fas fa-network-wired'];
     }
     /**
      * Adds the subnet group page to search elements.

taskstateedit/config/plugin.config.php

@@ -24,7 +24,7 @@
 $fog_plugin['description'] = _(
     'Allows editing/creating of Task States fog currently has.'
 );
-$fog_plugin['menuicon'] = 'fa fa-hourglass-start fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-traffic-light fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

taskstateedit/hooks/addtaskstateeditmenuitem.hook.php

@@ -88,7 +88,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Task States'), 'fa fa-hourglass-start'];
+            = [_('Task States'), 'fas fa-traffic-light'];
     }
     /**
      * Adds search element.

tasktypeedit/config/plugin.config.php

@@ -24,7 +24,7 @@
 $fog_plugin['description'] = _(
     'Allows editing/creating of Task Types fog currently has.'
 );
-$fog_plugin['menuicon'] = 'fa fa-th-list fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-tags fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

tasktypeedit/hooks/addtasktypeeditmenuitem.hook.php

@@ -88,7 +88,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Task Types'), 'fa fa-th-list'];
+            = [_('Task Types'), 'fas fa-tags'];
     }
     /**
      * Adds search element.

windowskey/config/plugin.config.php

@@ -33,7 +33,7 @@
     _('When the plugin is removed, the assigned key will remain'),
     _('with the host')
 );
-$fog_plugin['menuicon'] = 'fa fa-windows fa-fw';
+$fog_plugin['menuicon'] = 'fab fa-windows fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

windowskey/hooks/addwindowskeymenuitem.hook.php

@@ -86,7 +86,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('Windows Keys'), 'fa fa-windows'];
+            = [_('Windows Keys'), 'fab fa-windows'];
     }
     /**
      * Adds the windows key page to search elements.

wolbroadcast/config/plugin.config.php

@@ -24,7 +24,7 @@
 $fog_plugin['description'] = 'Allows you to create WOL across '
     . 'separate broadcast addresses. '
     . 'Should only be used if you cannot edit your network switches.';
-$fog_plugin['menuicon'] = 'fa fa-plug fa-fw';
+$fog_plugin['menuicon'] = 'fas fa-power-off fa-fw';
 $fog_plugin['version'] = '1.6.0';
 $fog_plugin['fog_min'] = '1.6.0';
 $fog_plugin['author'] = 'Tom Elliott';

wolbroadcast/hooks/addwolbroadcastmenuitem.hook.php

@@ -86,7 +86,7 @@ public function menuUpdate($arguments)
     public function menuData($arguments)
     {
         $arguments['hook_main'][$this->node]
-            = [_('WOL Broadcasts'), 'fa fa-plug'];
+            = [_('WOL Broadcasts'), 'fas fa-power-off'];
     }
     /**
      * Adds the wol page to search elements.