Changeset 72 for trunk

Timestamp:

02/16/11 18:04:21 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint - adding sort-on-title-click to record list columns

• HTML seems complete
• Still need to store sort type, direction in session
• Still need to pass sort info into record retrieval sub in DNSDB.pm

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (4 diffs)
• templates/reclist.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -927 +927 @@
 ## for order, need to map input to column names
   my $order = shift || 'host';
+  my $direction = shift || 'ASC';
 
   my $sql = "SELECT record_id,host,type,val,distance,weight,port,ttl FROM ";
@@ -934 +935 @@
     $sql .= " records where domain_id=$id";
   }
-  $sql .= " and not type=$reverse_typemap{SOA} order by $order";
+  $sql .= " and not type=$reverse_typemap{SOA} order by $order $direction";
 ##fixme:  need to set nstart properly (offset is not internally multiplied with limit)
   $sql .= " limit $nrecs offset ".($nstart*$nrecs) if $nstart ne 'all';

trunk/dns.cgi

@@ -252 +252 @@
     my ($count) = ($sth->fetchrow_array);
 
+##work
+# set up the headers
+  my @cols = ('host', 'type', 'val', 'distance', 'weight', 'port', 'ttl');
+  my %colheads = (host => 'Name', type => 'Type', val => 'Address',
+        distance => 'Distance', weight => 'Weight', port => 'Port', ttl => 'TTL');
+  my %custom = (id => $webvar{id}, defrec => $webvar{defrec});
+  fill_colheads($sortby, $sortorder, \@cols, \%colheads, \%custom);
+
 # fill the page-count and first-previous-next-last-all details
   fill_pgcount($count,"records",domainName($dbh,$webvar{id}));
@@ -1097 +1105 @@
   $page->param(minttl   => $soa{minttl});
   $page->param(ttl      => $soa{ttl});
+
+  $startwith = $session->param($webvar{page}.'startwith');
+  $filter = $session->param($webvar{page}.'filter');
 
 #  my @foo2 = getDomRecs($dbh,'def',1);
@@ -1484 +1495 @@
   my $cols = shift;
   my $colnames = shift;
+  my $custom = shift;
 
   my @headings;
@@ -1501 +1513 @@
       $coldata{order} = 'ASC';
     }
+    if ($custom) {
+      foreach my $ckey (keys %$custom) {
+        $coldata{$ckey} = $custom->{$ckey};
+      }
+    }
     push @headings, \%coldata;
   }

trunk/templates/reclist.tmpl

@@ -50 +50 @@
 <TMPL_IF reclist>
 <tr class="darkrowheader">
-        <td>Name</td>
+<TMPL_LOOP NAME=colheads>
+        <!-- td class="datahead_<TMPL_IF firstcol>l<TMPL_ELSE>s</TMPL_IF>" -->
+<td><a href="dns.cgi?sid=<TMPL_VAR
+NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
+NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR 
+NAME=order>&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>"><TMPL_VAR
+NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>"
+src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></td></TMPL_LOOP>
+
+<!--    <td>Name</td>
         <td>Type</td>
         <td>Address</td>
-        <td>Distance</td><td>Weight</td><td>Port</td><td>TTL</td><td>Delete</td></tr>
+        <td>Distance</td><td>Weight</td><td>Port</td><td>TTL</td> -->
+
+        <td>Delete</td>
+</tr>
 <TMPL_LOOP NAME=reclist>
 <tr class="row<TMPL_VAR NAME=row>">