Changeset 465

Timestamp:

08/06/10 16:30:33 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert showmaster page to template.
See #3.

Location:

branches/htmlform

Files:

• cgi-bin/main.cgi (modified) (4 diffs)
• ipdb.css (modified) (3 diffs)
• templates/showmaster.tmpl (added)

branches/htmlform/cgi-bin/main.cgi

@@ -308 +308 @@
 sub showMaster {
 
-  print qq(<center><div class="heading">Summarizing routed blocks for ).
-        qq($webvar{block}:</div></center><br>\n);
+  $page->param(master => $webvar{block});
 
   my %allocated;
   my %free;
-  my %routed;
+  my %cities;
   my %bigfree;
 
@@ -331 +330 @@
     $bigfree{"$cidr"} = 128;
     # Retain the routing destination
-    $routed{"$cidr"} = $data[1];
+    $cities{"$cidr"} = $data[1];
   }
 
   # Check if there were actually any blocks routed from this master
   if ($i > 0) {
-    startTable('Routed block','Routed to','Allocated blocks',
-        'Free blocks','Largest free block');
 
     # Count the allocations
@@ -365 +362 @@
     }
 
-    # Print the data.
-    my $count=0;
+    my @routed;
+    my $rowclass = 0;
     foreach my $master (@localmasters) {
-      my @row = ("<a href=\"/ip/cgi-bin/main.cgi?action=showrouted&block=$master\">$master</a>",
-        $routed{"$master"}, $allocated{"$master"},
-        $free{"$master"},
-        ( ($bigfree{"$master"} eq 128) ? ("&lt;NONE&gt;") : ("/".$bigfree{"$master"}) )
-      );
-      printRow(\@row, 'color1' ) if($count%2==0);
-      printRow(\@row, 'color2' ) if($count%2!=0);
-      $count++;
-    }
-  } else {
-    # If a master block has no routed blocks, then by definition it has no
-    # allocations, and can be deleted.
-    print qq(<hr width="60%"><center><div class="heading">No allocations in ).
-        qq($master.</div>\n).
-        ($IPDBacl{$authuser} =~ /d/ ?
-                qq(<form action="/ip/cgi-bin/main.cgi" method=POST>\n).
-                qq(<input type=hidden name=action value="delete">\n).
-                qq(<input type=hidden name=block value="$master">\n).
-                qq(<input type=hidden name=alloctype value="mm">\n).
-                qq(<input type=submit value=" Remove this master ">\n).
-                qq(</form></center>\n) :
-                '');
+      my %row = (
+        rowclass => $rowclass % 2,
+        block => "$master",
+        city => $cities{"$master"},
+        nsubs => $allocated{"$master"},
+        nfree => $free{"$master"},
+        lfree => ( ($bigfree{"$master"} eq 128) ? ("&lt;NONE&gt;") : ("/".$bigfree{"$master"}) )
+        );
+      push @routed, \%row;
+      $rowclass++;
+    }
+    $page->param(routedlist => \@routed);
 
   } # end check for existence of routed blocks in master
 
-  print qq(</table>\n<hr width="60%">\n).
-        qq(<center><div class="heading">Unrouted blocks in $master:</div></center><br>\n);
-
-  startTable('Netblock','Range');
+  $page->param(delmaster => ($IPDBacl{$authuser} =~ /d/));
 
   # Snag the free blocks.
@@ -403 +387 @@
         "routed='n' order by cidr");
   $sth->execute();
+  my @unrouted;
+  my $rowclass = 0;
   while (my @data = $sth->fetchrow_array()) {
     my $cidr = new NetAddr::IP $data[0];
-    my @row = ("$cidr", $cidr->range);
-    printRow(\@row, 'color1' ) if($count%2==0);
-    printRow(\@row, 'color2' ) if($count%2!=0);
-    $count++;
-  }
-
-  print "</table>\n";
+    my %row = (
+        rowclass => $rowclass % 2,
+        fblock => "$cidr",
+        frange => $cidr->range
+        );
+    push @unrouted, \%row;
+    $rowclass++;
+  }
+  $page->param(unrouted => \@unrouted);
+
 } # showMaster
 

branches/htmlform/ipdb.css

@@ -88 +88 @@
         margin-left: auto;
         margin-right: auto;
+        text-align: center;
 }
 
@@ -106 +107 @@
 }
 
+hr.w60 {
+        width: 60%;
+}
+
 /* legacy defs */
 tr.color0 {
@@ -165 +170 @@
 }
 
+.tbltitle {
+        text-align: center;
+        font-size: 110%;
+        font-weight: bold;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+}
 .tblsubtitle {
         font-size: 105%;