From ce054dd37da05a3bcbe65f266e597a36b8a32aed Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 31 Aug 2022 15:28:59 -0400
Subject: [PATCH] Closes #9477: Add a button to clear applied table column
 ordering

---
 netbox/project-static/dist/netbox-dark.css  | Bin 375157 -> 375157 bytes
 netbox/project-static/dist/netbox-light.css | Bin 232694 -> 232694 bytes
 netbox/project-static/dist/netbox-print.css | Bin 729266 -> 729266 bytes
 netbox/project-static/styles/netbox.scss    |   4 ++--
 netbox/templates/inc/table_htmx.html        |  10 ++++++++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 94718ac407f4e5b8c9acba2d7c97c9936fc79765..6f6c3904db60d7004535de4a27308635d5832378 100644
GIT binary patch
delta 39
qcmezRN$l$<v4$4L7N!>F7M3ln8!{N}rf<w(&4Ey2+f6cA9RmPO%MQ8#

delta 39
qcmezRN$l$<v4$4L7N!>F7M3ln8!{Lbrf<w(&4Ey2+f6cA9RmPLDGq)B

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index bf0ba2f62028e5344fcee1c4c872304e047234d6..0a95db07f7f529fc4c469610f9099fea88a2b4fc 100644
GIT binary patch
delta 30
mcmex1lkeM1zJ?aY7N#xCiD8U()04uOy%_DbuMK1NGy?#*s0xYz

delta 30
mcmex1lkeM1zJ?aY7N#xCiD8Ti)04uOy%-g?uMK1NGy?#(G73%r

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 4ccd41d8ecb940fb798642fbf1bd0a4500dcc3ff..4ae1302d3150865d6f3661ac8ad752ce93a36b3c 100644
GIT binary patch
delta 114
zcmdmVP-oLYorV_17N!>F7M2#)7Pc1l7LFFqEnH=_Om>OW5B_4-oc^GOi-S!su{aqh
sQ22#IYx;pwE)G_(!1QOeT(Kw$+4WLVQB_V~U&qDDXt#Z99oOH50Bq+f%K!iX

delta 114
zcmdmVP-oLYorV_17N!>F7M2#)7Pc1l7LFFqEnH=_ObUt95B_4-oc^GOi-S!su{aqh
sQ22#IYx;pwE)G_(!1QOeT(Kw$+4WLVQB_V~U&qDDsIYx&9oOH508Ec67XSbN

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index d78e9e9b9..8ff224172 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -235,12 +235,12 @@ table {
     }
   }
 
-  th.asc a::after {
+  th.asc > a::after {
     content: "\f0140";
     font-family: 'Material Design Icons';
   }
 
-  th.desc a::after {
+  th.desc > a::after {
     content: "\f0143";
     font-family: 'Material Design Icons';
   }
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html
index bf8156c2b..45bfb390d 100644
--- a/netbox/templates/inc/table_htmx.html
+++ b/netbox/templates/inc/table_htmx.html
@@ -8,6 +8,16 @@
           {% for column in table.columns %}
             {% if column.orderable %}
               <th {{ column.attrs.th.as_html }}>
+                {% if column.is_ordered %}
+                  <div class="float-end">
+                    <a href="#"
+                       hx-get="{% querystring table.prefixed_order_by_field='' %}"
+                       hx-target="#object_list"
+                       hx-push-url="true"
+                       class="text-danger"
+                    ><i class="mdi mdi-close"></i></a>
+                  </div>
+                {% endif %}
                 <a href="#"
                    hx-get="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
                    hx-target="#object_list"