Merge e66d691 into 974c51a

voxpupuli · Sep 21, 2020 · efbfb1c · efbfb1c
2 parents 974c51a + e66d691
commit efbfb1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/puppetboard/templates/_macros.html b/puppetboard/templates/_macros.html
@@ -60,6 +60,7 @@
    // Rendering - add rendering options for columns
     "columnDefs": [ {
       "targets": -1,
+      "type": "natural-time-delta-pre",
       "data:": null,
       "render": function (data, type, full, meta) {
        shorta = data.toString().replace(/[{},]/g, "<br />");

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
@@ -33,6 +33,7 @@
       <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
       <script src="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/js/jquery.dataTables.min.js"></script>
       <script src="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/js/dataTables.semanticui.min.js"></script>
+      <script src="//cdn.datatables.net/plug-ins/1.10.21/sorting/natural-time-delta.js"></script>
       {% if config.LOCALISE_TIMESTAMP %}
         <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js"></script>
       {% endif %}