projects / mirror / userdir-ldap-cgi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dcd50e6)
use libjs-jquery-tablesorter to sort machines.cgi
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 13 Jun 2012 16:49:41 +0000 (18:49 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 13 Jun 2012 20:14:25 +0000 (22:14 +0200)
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
debian/changelog patch | blob | history
debian/control patch | blob | history
debian/links [new file with mode: 0644] patch | blob
debian/rules patch | blob | history
html/debdb.css patch | blob | history
html/template/header.wml patch | blob | history
machines.cgi patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index bf6bab3..224b677 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-userdir-ldap-cgi (0.3.37) Xnstable; urgency=low
+userdir-ldap-cgi (0.3.37) UNRELEASED; urgency=low
 
-  * 
+  * use libjs-jquery-tablesorter to sort machines.cgi
 
  -- Martin Zobel-Helas <zobel@debian.org>  Fri, 09 Mar 2012 10:03:46 +0100
 
diff --git a/debian/control b/debian/control
index 32e64d4..f1dcc71 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,9 @@ Depends: userdir-ldap,
        python-crack | python-cracklib
        ,
        cracklib-runtime
+       ,
+       libjs-jquery,
+       libjs-jquery-tablesorter
 Recommends: wamerican,
        wamerican-large,
        wamerican-small,
diff --git a/debian/links b/debian/links
new file mode 100644 (file)
index 0000000..4c96adb
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,3 @@
+/usr/share/javascript/jquery var/www/userdir-ldap/js/jquery
+/usr/share/javascript/jquery-tablesorter var/www/userdir-ldap/js/jquery-tablesorter
+/usr/share/javascript/jquery-metadata var/www/userdir-ldap/js/jquery-metadata
diff --git a/debian/rules b/debian/rules
index 50b8352..454da0a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,8 @@ binary-indep: build
 
        install -m 644 apache-config.txt $(i)/usr/share/doc/$(package)
 
+       dh_link
+
        dh_installchangelogs
        dh_installcron
        dh_fixperms --exclude=web-cookies
diff --git a/html/debdb.css b/html/debdb.css
index 57d73cc..ba99d0f 100644 (file)
--- a/html/debdb.css
+++ b/html/debdb.css
@@ -24,3 +24,20 @@ td.center {
 h1.h1class {
     text-align: center;
 }
+
+table           { border-collapse: separate; border-spacing: 1px; }
+
+table.tablesorter {
+font-size: 100%;
+text-align: center;
+}
+
+table.tablesorter th {
+    padding: 2px;
+    text-align: center;
+    vertical-align: middle;
+}
+table.tablesorter tbody td {
+    padding: 2px;
+    vertical-align: middle;
+}
diff --git a/html/template/header.wml b/html/template/header.wml
index eb8479e..8213247 100644 (file)
--- a/html/template/header.wml
+++ b/html/template/header.wml
@@ -23,10 +23,25 @@
   <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="$(DBHOME)/debian.css" rel="stylesheet" type="text/css" />
 <link href="/debdb.css" rel="stylesheet" type="text/css" />
 
 <link href="/debian-$(CUR_ISO_LANG).css" rel="stylesheet" type="text/css" media="all"/>
 :#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 type="text/javascript">
+       $(function() {
+               $("#machines").tablesorter({widthFixed: true, widgets: ['zebra']})
+               $(".sort").removeAttr("href")
+       });
+
+       </script>
 </head>
 <body>
diff --git a/machines.cgi b/machines.cgi
index ba84f18..f01d4e1 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -127,6 +127,7 @@ my $host = lc($query->param('host'));
 my $sortby = lc($query->param('sortby')) || "host";
 my $sortorder = lc($query->param('sortorder')) || "asc";
 
+
 &Util::HTMLSendHeader;
 $ldap = Net::LDAP->new($config{ldaphost}) || &Util::HTMLError($!);
 &Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
@@ -211,19 +212,19 @@ if ($output{havehostdata}) {
 } else {
   # display summary info
   $hostdetails = "<h1>Summary</h1>\n";
-  $hostdetails .= "<table class=\"debform\" border=\"1\" width=\"90%\">\n<tr>";
+  $hostdetails .= "<table id=\"machines\" class=\"tablesorter\" border=\"1\" cellpadding=\"0\" cellspacing=\"1\">\n<thead>\n<tr>";
   foreach $key (@summaryorder) {
     if ($sortby ne $key) {
-      $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
+      $hostdetails .= "<th><a class=\"sort\" href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
     } else {
       if ($sortorder ne "dsc") {
-        $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=dsc\">$summaryattrs{$key}</a></th>";
+        $hostdetails .= "<th><a class=\"sort\" href=\"machines.cgi?sortby=$key&sortorder=dsc\">$summaryattrs{$key}</a></th>";
       } else {
-        $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
+        $hostdetails .= "<th><a class=\"sort\" href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
       }
     }
   }
-  $hostdetails .= "</tr>\n";
+  $hostdetails .= "</tr>\n</thead>\n<tbody>\n";
   
   my @sorted;
   if ($sortorder eq "asc") {
@@ -239,7 +240,7 @@ if ($output{havehostdata}) {
     }
     $hostdetails .= "</tr>\n";
   }
-  $hostdetails .= "</table>\n";
+  $hostdetails .= "</tbody>\n</table>\n";
 }
 
 # Finally, we can write the output... yuck...
Mirror of Debian's userdir-ldap-cgi repository