Changeset 818 for trunk/cgi-bin/main.cgi

Timestamp:

03/10/16 18:02:41 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Introduce a more "relaxed" layout for listing VRFs and master netblocks -
interleave the lists of master blocks for each VRF with the VRF heading,
instead of formally separating them onto different pages.

Refine and adapt showvrfs.tmpl to show the master blocks instead of
reinventing another wheel.

See #54.

File:

• trunk/cgi-bin/main.cgi (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -319 +319 @@
 sub showSummary {
   my $vrflist = listVRF($ip_dbh);
+
+  if ($IPDB::masterswithvrfs == 2) {
+    $page = HTML::Template->new(filename => "index2.tmpl", loop_context_vars => 1, global_vars => 1,
+        path => @templatepath);
+    # alternate layout;  put master blocks on the front summary page instead of "out"/"down" a
+    # layer in the browse tree
+    my $vrfinfo = HTML::Template->new(filename => "showvrf.tmpl", path => @templatepath);
+    foreach my $vrf (@$vrflist) {
+      my $masterlist = listSummary($ip_dbh, $vrf->{vrf});
+      $vrfinfo->param(vrf => $vrf->{vrf});
+      $vrfinfo->param(masterlist => $masterlist);
+      $vrfinfo->param(addmaster => ($IPDBacl{$authuser} =~ /s/) );
+      $vrfinfo->param(maydel => ($IPDBacl{$authuser} =~ /s/) );
+      $vrfinfo->param(sub => 1);
+      $vrf->{vrfinfo} = $vrfinfo->output;
+    }
+  }
+
   $page->param(vrflist => $vrflist);
 
   # Only systems/network should be allowed to add VRFs - or maybe higher?
   $page->param(addvrf => ($IPDBacl{$authuser} =~ /s/) );
+
 } # showSummary
 
@@ -338 +357 @@
   $utilbar->param(breadcrumb => \@rcrumbs);
 
+  $page->param(maydel => ($IPDBacl{$authuser} =~ /s/) );
   $page->param(addmaster => ($IPDBacl{$authuser} =~ /s/) );
 } # showVRF