From e009fbe59f39a717a4ad7bea5027d39cb5323225 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Apr 2020 04:04:53 -0700
Subject: [PATCH 1/4] Converted table heading icons in People to CSS glyphs

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/UserPresenter.php      | 27 +++++++------
 resources/views/users/index.blade.php | 57 ++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 2e7af6759138..5f656f23a946 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -171,21 +171,22 @@ public static function dataTableLayout()
                 "formatter" => "usersLinkObjFormatter"
             ],
             [
-                "field" => "assets_count",
-                "searchable" => false,
-                "sortable" => true,
-                "switchable" => true,
-                "title" => ' <span class="hidden-md hidden-lg">Assets</span>'
-                            .'<span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span>',
-                "visible" => true,
+                'field' => 'assets_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'escape' => true,
+                'class' => 'css-barcode',
+                'title' => 'Assets',
+                'visible' => true,
             ],
             [
                 "field" => "licenses_count",
                 "searchable" => false,
                 "sortable" => true,
                 "switchable" => true,
-                "title" => ' <span class="hidden-md hidden-lg">Licenses</span>'
-                    .'<span class="hidden-xs"><i class="fa fa-floppy-o fa-lg"></i></span>',
+                'class' => 'css-license',
+                "title" => 'License',
                 "visible" => true,
             ],
             [
@@ -193,8 +194,8 @@ public static function dataTableLayout()
                 "searchable" => false,
                 "sortable" => true,
                 "switchable" => true,
-                "title" => ' <span class="hidden-md hidden-lg">Consumables</span>'
-                    .'<span class="hidden-xs"><i class="fa fa-tint fa-lg"></i></span>',
+                'class' => 'css-consumable',
+                "title" => 'Consumables',
                 "visible" => true,
             ],
             [
@@ -202,8 +203,8 @@ public static function dataTableLayout()
                 "searchable" => false,
                 "sortable" => true,
                 "switchable" => true,
-                "title" => ' <span class="hidden-md hidden-lg">Accessories</span>'
-                    .'<span class="hidden-xs"><i class="fa fa-keyboard-o fa-lg"></i></span>',
+                'class' => 'css-accessory',
+                "title" => 'Accessories',
                 "visible" => true,
             ],
             [
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 4760077cf8a1..347e4f5d9473 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -14,6 +14,59 @@
 @stop
 
 @section('header_right')
+
+<style>
+
+    th.css-barcode > .th-inner,
+    th.css-license > .th-inner,
+    th.css-consumable > .th-inner,
+    th.css-accessory > .th-inner
+    {
+        font-size: 0px;
+        line-height: 0;
+        line-height: 4!important;
+        text-align: center;
+        text-rendering: auto;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+    }
+
+
+    th.css-barcode > .th-inner::before,
+    th.css-license > .th-inner::before,
+    th.css-consumable > .th-inner::before,
+    th.css-accessory > .th-inner::before
+
+    {
+        display: inline-block;
+        font: normal normal normal 14px/1 FontAwesome;
+        font-size: 20px;
+    }
+
+
+    th.css-barcode > .th-inner::before
+    {
+    content: "\f02a";
+    }
+
+    th.css-license > .th-inner::before
+    {
+        content: "\f0c7";
+    }
+
+    th.css-consumable > .th-inner::before
+    {
+        content: "\f043";
+    }
+
+    th.css-accessory > .th-inner::before
+    {
+        content: "\f11c";
+    }
+
+
+</style>
+
     @can('create', \App\Models\User::class)
       @if ($snipeSettings->ldap_enabled == 1)
       <a href="{{ route('ldap/user') }}" class="btn btn-default pull-right"><span class="fa fa-sitemap"></span> LDAP Sync</a>
@@ -90,7 +143,9 @@ class="table table-striped snipe-table"
 
 @stop
 
-@section('moar_scripts')
+@section('moar_scripts')val
+
+
 @include ('partials.bootstrap-table')
 
 

From a2f08bd3baa6fb23633ceb58e5408b125b0f0029 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Apr 2020 04:08:54 -0700
Subject: [PATCH 2/4] Added comments

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/index.blade.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 347e4f5d9473..adc1b7cdc7e5 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -16,7 +16,16 @@
 @section('header_right')
 
 <style>
+    /**
+    This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since
+    any HTML used in the UserPresenter "title" attribute breaks the HTML.
 
+    Instead, we use CSS to add the icon into the table header, which leaves the column selector
+    "title" text as-is.
+
+    See https://github.com/snipe/snipe-it/issues/7989
+
+     */
     th.css-barcode > .th-inner,
     th.css-license > .th-inner,
     th.css-consumable > .th-inner,

From 96eb96f964c40b798d5ceed25eff2bbef4f0bc51 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Apr 2020 04:27:00 -0700
Subject: [PATCH 3/4] Removed stray val (typo)

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index adc1b7cdc7e5..d25aa9c72db8 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -152,7 +152,7 @@ class="table table-striped snipe-table"
 
 @stop
 
-@section('moar_scripts')val
+@section('moar_scripts')
 
 
 @include ('partials.bootstrap-table')

From 3dfcb469910456b3213e00c5cd2f839d25dbf2c7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Apr 2020 04:41:08 -0700
Subject: [PATCH 4/4] Minor formatting changes

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/index.blade.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index d25aa9c72db8..813a955fdb91 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -18,7 +18,7 @@
 <style>
     /**
     This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since
-    any HTML used in the UserPresenter "title" attribute breaks the HTML.
+    any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
 
     Instead, we use CSS to add the icon into the table header, which leaves the column selector
     "title" text as-is.
@@ -32,9 +32,8 @@
     th.css-accessory > .th-inner
     {
         font-size: 0px;
-        line-height: 0;
         line-height: 4!important;
-        text-align: center;
+        text-align: left;
         text-rendering: auto;
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
@@ -55,7 +54,7 @@
 
     th.css-barcode > .th-inner::before
     {
-    content: "\f02a";
+        content: "\f02a";
     }
 
     th.css-license > .th-inner::before