Browse Source

Closes #9477: Add a button to clear applied table column ordering

jeremystretch 3 years ago
parent
commit
ce054dd37d

File diff suppressed because it is too large
+ 0 - 0
netbox/project-static/dist/netbox-dark.css


File diff suppressed because it is too large
+ 0 - 0
netbox/project-static/dist/netbox-light.css


File diff suppressed because it is too large
+ 0 - 0
netbox/project-static/dist/netbox-print.css


+ 2 - 2
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';
   }

+ 10 - 0
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"

Some files were not shown because too many files changed in this diff