X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=3a333fedde38f151eaf28ee9a65b4bb7a2bfc02a;hb=fe0a9be917cbfeb48e8ff5911fa76e39bb28d6c8;hp=ba84f18232e745d554af1011a3591f031de9738a;hpb=ef9e1b8c530e45969d066d2864af3906fc8386c5;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/machines.cgi b/machines.cgi
index ba84f18..3a333fe 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -51,12 +51,13 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
 # ditto for summary
 %summaryattrs = ('hostname' => 'Host name',
 		 'host'     => 'just for a link',
+		 'description' => 'Description',
 		 'architecture' => 'Architecture',
 		 'status' => 'Status',
 		 'access' => 'Access',
 		 'sponsor' => 'Sponsor',
 		 'purpose' => 'Purpose');
-@summaryorder = qw{hostname architecture sponsor purpose status access};
+@summaryorder = qw{hostname description architecture sponsor purpose status access};
 %summarylistitems = map {$_=>1} qw{purpose sponsor};
 
 # Global settings...
@@ -120,13 +121,14 @@ sub item_uplist($) {
 	return $out;
 }
 
-$SIG{__DIE__} = \&DieHandler;
+#$SIG{__DIE__} = \&DieHandler;
 
 my $query = new CGI;
 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';
@@ -204,26 +206,26 @@ if ($output{havehostdata}) {
   $hostdetails .= "<ul>\n";
   foreach $key (@attrorder) {
     if ($output{$key}) {
-      $hostdetails .= "<li><b>$attrs{$key}:</b>$output{$key}\n";
+      $hostdetails .= "<li><b>$attrs{$key}</b>: $output{$key}\n";
     }
   }
   $hostdetails .= "</ul>\n";
 } 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 +241,7 @@ if ($output{havehostdata}) {
     }
     $hostdetails .= "</tr>\n";
   }
-  $hostdetails .= "</table>\n";
+  $hostdetails .= "</tbody>\n</table>\n";
 }
 
 # Finally, we can write the output... yuck...