Changeset 478

Timestamp:

08/27/10 17:56:58 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlfrom

Set a global variable so we can move the site to any level of
web directory. See #17 - note this is an internal autoconfiguration
that shouldn't need to be exposed.
Make code/template structure for setting row colours in tables more
consistent - also tweak search.cgi so it spits out live colour
classes. See #3.

Location:

branches/htmlform

Files:

• cgi-bin/main.cgi (modified) (8 diffs)
• cgi-bin/search.cgi (modified) (1 diff)
• templates/index.tmpl (modified) (1 diff)

branches/htmlform/cgi-bin/main.cgi

@@ -29 +29 @@
 openlog "IPDB","pid","$IPDB::syslog_facility";
 
+## Environment.  Collect some things, process some things, set some things...
+
 # Collect the username from HTTP auth.  If undefined, we're in
 # a test environment, or called without a username.
@@ -37 +39 @@
   $authuser = $ENV{'REMOTE_USER'};
 }
+
+# anyone got a better name?  :P
+my $thingroot = $ENV{SCRIPT_FILENAME};
+$thingroot =~ s|cgi-bin/main.cgi||;
 
 syslog "debug", "$authuser active, $ENV{'REMOTE_ADDR'}";
@@ -52 +58 @@
 
 # Set up some globals
-##fixme - need to autofill this somehow
-$ENV{HTML_TEMPLATE_ROOT} = '/home/kdeugau/dev/ipdb/trunk/templates';
+$ENV{HTML_TEMPLATE_ROOT} = $thingroot."templates";
 
 my $header = HTML::Template->new(filename => "header.tmpl");
@@ -272 +277 @@
   my $rowclass=0;
   foreach my $master (@masterblocks) {
-    my %row = (rowclass => "row$rowclass",
+    my %row = (
+        rowclass => $rowclass++ % 2,
         master => "$master",
         routed => $routed{"$master"},
@@ -280 +286 @@
         );
     push (@masterlist, \%row);
-    $rowclass++;  $rowclass = $rowclass % 2;
   }
   $page->param(masterlist => \@masterlist);
@@ -354 +359 @@
     foreach my $master (@localmasters) {
       my %row = (
-        rowclass => $rowclass % 2,
+        rowclass => $rowclass++ % 2,
         block => "$master",
         city => $cities{"$master"},
@@ -362 +367 @@
         );
       push @routed, \%row;
-      $rowclass++;
     }
     $page->param(routedlist => \@routed);
@@ -380 +384 @@
     my $cidr = new NetAddr::IP $data[0];
     my %row = (
-        rowclass => $rowclass % 2,
+        rowclass => $rowclass++ % 2,
         fblock => "$cidr",
         frange => $cidr->range
         );
     push @unrouted, \%row;
-    $rowclass++;
   }
   $page->param(unrouted => \@unrouted);

branches/htmlform/cgi-bin/search.cgi

@@ -470 +470 @@
         "&pool=$data[0]\">List IPs</a>";
     }
-    printRow(\@row, 'color1', 1) if ($count%2==0); 
-    printRow(\@row, 'color2', 1) if ($count%2!=0);
-    $count++;
+    printRow(\@row, "row".($count++ % 2), 1);
   }
 

branches/htmlform/templates/index.tmpl

@@ -10 +10 @@
 </tr>
 <TMPL_LOOP NAME=masterlist>
-<tr class="<TMPL_VAR name=rowclass>">
+<tr class="row<TMPL_VAR name=rowclass>">
 <td><a href="/ip/cgi-bin/main.cgi?action=showmaster&amp;block=<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master></a></td>
 <td><TMPL_VAR NAME=routed></td>