Changeset 450

Timestamp:

07/28/10 10:56:09 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Added missing index and footer templates
Update default CSS with definitions for footer, alternate-row colours
Have main.cgi look for a template matching $webvar{action}
Convert main summary page content to template
See #3.

Location:

branches/htmlform

Files:

• cgi-bin/CommonWeb.pm (modified) (1 diff)
• cgi-bin/main.cgi (modified) (5 diffs)
• ipdb.css (modified) (2 diffs)
• templates (added)
• templates/footer.tmpl (added)
• templates/index.tmpl (added)

branches/htmlform/cgi-bin/CommonWeb.pm

@@ -65 +65 @@
         </center>
         );
-        print "<br>would print footer but already dun gone and shot($self->foot)\n";
+        print "<br>would print footer but already dun gone and shot(self->foot)\n";
         exit(0);
 }

branches/htmlform/cgi-bin/main.cgi

@@ -60 +60 @@
         ));
 
-
 # Set up the CGI object...
 my $q = new CGI::Simple;
@@ -74 +73 @@
 
 if(!defined($webvar{action})) {
-  $webvar{action} = "<NULL>";   #shuts up the warnings.
-}
+  $webvar{action} = "index";    #shuts up the warnings.
+}
+
+my $page = HTML::Template->new(filename => "$webvar{action}.tmpl");
 
 if($webvar{action} eq 'index') {
@@ -182 +183 @@
 #       if $IPDBacl{$authuser} =~ /A/;
 
+print $page->output;
+
 # We print the footer here, so we don't have to do it elsewhere.
 my $footer = HTML::Template->new(filename => "footer.tmpl");
@@ -233 +236 @@
 # Initial display:  Show master blocks with total allocated subnets, total free subnets
 sub showSummary {
-
-  startTable('Master netblock', 'Routed netblocks', 'Allocated netblocks',
-        'Free netblocks', 'Largest free block');
-
   my %allocated;
   my %free;
@@ -276 +275 @@
   }
 
-  # Print the data.
-  my $count=0;
+  # Assemble the data to stuff into the template.
+  my @masterlist;
+  my $rowclass=0;
   foreach my $master (@masterblocks) {
-    my @row = ("<a href=\"/ip/cgi-bin/main.cgi?action=showmaster&block=$master\">$master</a>",
-        $routed{"$master"}, $allocated{"$master"}, $free{"$master"}, 
-        ( ($bigfree{"$master"} eq '') ? ("&lt;NONE&gt;") : ("/".$bigfree{"$master"}) )
+    my %row = (rowclass => "row$rowclass",
+        master => "$master",
+        routed => $routed{"$master"},
+        allocated => $allocated{"$master"},
+        free => $free{"$master"},
+        bigfree => ( ($bigfree{"$master"} eq '') ? ("&lt;NONE&gt;") : ("/".$bigfree{"$master"}) )
         );
-
-    printRow(\@row, 'color1' ) if($count%2==0);
-    printRow(\@row, 'color2' ) if($count%2!=0);
-    $count++;
-  }
-  print "</table>\n";
-  if ($IPDBacl{$authuser} =~ /a/) {
-    print qq(<a href="/ip/cgi-bin/main.cgi?action=addmaster">Add new master block</a><br><br>\n);
-  }
-  print "Note:  Free blocks noted here include both routed and unrouted blocks.\n";
+    push (@masterlist, \%row);
+    $rowclass++;  $rowclass = $rowclass % 2;
+  }
+  $page->param(masterlist => \@masterlist);
+
+  $page->param(addmaster => ($IPDBacl{$authuser} =~ /a/) );
 
 } # showSummary

branches/htmlform/ipdb.css

@@ +1 @@
+/* Specific divs */
+#adminlink {
+        position: absolute;
+        right: 10px;
+        bottom: 5px;
+}
+#footer {
+        border-top: thin solid #000000;
+}
+#contact {
+        font-size: 10px;
+        position: absolute;
+        right: 10px;
+        text-align: right;
+}
+
 body {
   background-color: #ffffff;
@@ -12 +28 @@
 a:active        { color:#cc0000; }      /* selected link */
 
+/* Defs for bulk-data rows */
+tr.header {
+        background-color: #CCCCCC;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+tr.row0 {
+        background-color: #A8C4D0;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 90%;
+}
+tr.row1 {
+        background-color: #d0e0e0;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 90%;
+}
+
+/* legacy defs */
 tr.color0 {
         background-color: #A8C4D0;