projects / mirror / userdir-ldap-cgi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7549c5)
Replace use of jquery-tablesorter with DataTables
authorAdam D. Barratt <adam@adam-barratt.org.uk>
Fri, 8 Nov 2019 15:12:46 +0000 (15:12 +0000)
committerAdam D. Barratt <adam@adam-barratt.org.uk>
Fri, 8 Nov 2019 15:12:46 +0000 (15:12 +0000)
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
html/debdb.js patch | blob | history
html/template/header.wml patch | blob | history
machines.cgi patch | blob | history

diff --git a/html/debdb.js b/html/debdb.js
index 40336f3..a92b8a6 100644 (file)
--- a/html/debdb.js
+++ b/html/debdb.js
@@ -1,4 +1,8 @@
-$(function() {
-       $("#machines").tablesorter({widthFixed: true, widgets: ['zebra']})
+$(document).ready(function() {
+       $("#machines").DataTable({
+               orderCellsTop: true,
+               pageLength: 25,
+               lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]]
+       });
        $(".sort").removeAttr("href")
 });
diff --git a/html/template/header.wml b/html/template/header.wml
index 2f4aedf..622615d 100644 (file)
--- a/html/template/header.wml
+++ b/html/template/header.wml
@@ -23,8 +23,7 @@
   <meta name="Modified"  content="$(WML_GEN_ISOTIME)" />
 {#style#}
 {#style#:
- <link type="text/css" href="/js/jquery-tablesorter/themes/blue/style.css" rel="stylesheet" />
- <link type="text/css" href="/js/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css" rel="stylesheet" />
+<link href="/js/datatables.min.css" rel="stylesheet" type="text/css">
 
 <link href="$(DBHOME)/debian.css" rel="stylesheet" type="text/css" />
 <link href="/debdb.css" rel="stylesheet" type="text/css" />
@@ -33,9 +32,7 @@
 :#style#}
 
  <script language="javascript" type="text/javascript" src="/js/jquery/jquery.js"></script>
- <script language="javascript" type="text/javascript" src="/js/jquery-metadata/jquery.metadata.js"></script>
- <script language="javascript" type="text/javascript" src="/js/jquery-tablesorter/jquery.tablesorter.js"></script>
- <script language="javascript" type="text/javascript" src="/js/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js"></script>
+ <script language="javascript" type="text/javascript" src="/js/datatables.min.js"></script>
  <script language="javascript" type="text/javascript" src="/js/debdb.js"></script>
 </head>
 <body>
diff --git a/machines.cgi b/machines.cgi
index e867098..74cacb6 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -190,7 +190,7 @@ if ($output{havehostdata}) {
 } else {
   # display summary info
   $hostdetails = "<h1>Summary</h1>\n";
-  $hostdetails .= "<table id=\"machines\" class=\"tablesorter\" border=\"1\" cellpadding=\"0\" cellspacing=\"1\">\n<thead>\n<tr>";
+  $hostdetails .= "<table id=\"machines\" class=\"display compact cell-border\" border=\"1\" cellpadding=\"0\" cellspacing=\"1\">\n<thead>\n<tr>";
   foreach $key (@summaryorder) {
     if ($sortby ne $key) {
       $hostdetails .= "<th><a class=\"sort\" href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
Mirror of Debian's userdir-ldap-cgi repository