From: Martin Zobel-Helas Date: Wed, 13 Jun 2012 16:49:41 +0000 (+0200) Subject: use libjs-jquery-tablesorter to sort machines.cgi X-Git-Tag: release-0.3.40~68 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=eae592f7884ae95cabd41c3984a8672ecae961c2 use libjs-jquery-tablesorter to sort machines.cgi Signed-off-by: Martin Zobel-Helas --- diff --git a/debian/changelog b/debian/changelog index bf6bab3..224b677 100644 --- 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 Fri, 09 Mar 2012 10:03:46 +0100 diff --git a/debian/control b/debian/control index 32e64d4..f1dcc71 100644 --- 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 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 --- 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 --- 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 --- a/html/template/header.wml +++ b/html/template/header.wml @@ -23,10 +23,25 @@ {#style#} {#style#: + + + :#style#} + + + + + + diff --git a/machines.cgi b/machines.cgi index ba84f18..f01d4e1 100755 --- 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 = "

Summary

\n"; - $hostdetails .= "\n"; + $hostdetails .= "

\n\n"; foreach $key (@summaryorder) { if ($sortby ne $key) { - $hostdetails .= ""; + $hostdetails .= ""; } else { if ($sortorder ne "dsc") { - $hostdetails .= ""; + $hostdetails .= ""; } else { - $hostdetails .= ""; + $hostdetails .= ""; } } } - $hostdetails .= "\n"; + $hostdetails .= "\n\n\n"; my @sorted; if ($sortorder eq "asc") { @@ -239,7 +240,7 @@ if ($output{havehostdata}) { } $hostdetails .= "\n"; } - $hostdetails .= "

$summaryattrs{$key}	$summaryattrs{$key}	$summaryattrs{$key}	$summaryattrs{$key}	$summaryattrs{$key}	$summaryattrs{$key}

\n"; + $hostdetails .= "\n\n"; } # Finally, we can write the output... yuck...