Changeset 697

Timestamp:

02/18/15 17:16:21 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add "breadcrumb" navigation trace to most pages.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (8 diffs)
• ipdb.css (modified) (1 diff)
• templates/header.tmpl (modified) (1 diff)
• templates/utilbar.tmpl (added)

trunk/cgi-bin/IPDB.pm

@@ -31 +31 @@
         &listSummary &listSubs &listContainers &listAllocations &listFree &listPool
         &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
-        &ipParent &subParent &blockParent &getRoutedCity
+        &ipParent &subParent &blockParent &getBreadCrumbs &getRoutedCity
         &allocateBlock &updateBlock &deleteBlock &getBlockData &getBlockRDNS &getRDNSbyIP
         &getNodeList &getNodeName &getNodeInfo
@@ -46 +46 @@
                 &listSummary &listSubs &listContainers &listAllocations &listFree &listPool
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
-                &ipParent &subParent &blockParent &getRoutedCity
+                &ipParent &subParent &blockParent &getBreadCrumbs &getRoutedCity
                 &allocateBlock &updateBlock &deleteBlock &getBlockData &getBlockRDNS &getRDNSbyIP
                 &getNodeList &getNodeName &getNodeInfo
@@ -950 +950 @@
 
 
+## IPDB::getBreadCrumbs()
+# Retrieve the ID and CIDR of a block's parent(s) up to the master block
+# Returns an arrayref to a list of hashrefs with CIDR and block ID
+sub getBreadCrumbs {
+  my $dbh = shift;
+  my $parent = shift;
+  my @result;
+
+  my $sth = $dbh-> prepare("SELECT cidr,type,id,parent_id FROM allocations WHERE id=?");
+
+  while ($parent != 0) {
+    $sth->execute($parent);
+    my ($cidr,$type,$id,$pid) = $sth->fetchrow_array;
+    push @result, {cidr => $cidr, link => $id, ispool => ($type =~ /^.[dp]$/ ? 1 : 0)};
+    $parent = $pid;
+  }
+
+  return \@result;
+} # end getBread()
+
+
 ## IPDB::getRoutedCity()
 # Get the city for a routed block.

trunk/cgi-bin/main.cgi

@@ -74 +74 @@
 my $header = HTML::Template->new(filename => "header.tmpl");
 my $footer = HTML::Template->new(filename => "footer.tmpl");
+my $utilbar = HTML::Template->new(filename => "utilbar.tmpl", loop_context_vars => 1, global_vars => 1);
+
+print "Content-type: text/html\n\n";
 
 $header->param(version => $IPDB::VERSION);
 $header->param(addperm => $IPDBacl{$authuser} =~ /a/);
 $header->param(webpath => $IPDB::webpath);
-print "Content-type: text/html\n\n", $header->output;
+
+$utilbar->param(webpath => $IPDB::webpath);
+
+print $header->output;
 
 
@@ -221 +227 @@
 #print "Content-type: text/html\n\n", $header->output;
 $page->param(webpath => $IPDB::webpath);
+print $utilbar->output;
 print $page->output;
 
@@ -278 +285 @@
 #$page->param(editme => 1) unless $pinfo->{type} ne 'mm';
 
+  my $crumbs = getBreadCrumbs($ip_dbh, $pinfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
   $page->param(self_id => $webvar{parent});
   $page->param(block => $pinfo->{block});
@@ -292 +303 @@
   my $poolinfo = getBlockData($ip_dbh, $webvar{pool});
   my $cidr = new NetAddr::IP $poolinfo->{block};
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $poolinfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
 
   $page->param(block => $cidr);
@@ -348 +364 @@
     # seems reasonable that a new allocation would share a VRF with its parent
     $page->param(pvrf => $pinfo->{vrf});
+
+    # Tree navigation
+    my $crumbs = getBreadCrumbs($ip_dbh, $webvar{parent});
+    my @rcrumbs = reverse (@$crumbs);
+    $utilbar->param(breadcrumb => \@rcrumbs);
 
     $webvar{fbtype} = '' if !$webvar{fbtype};
@@ -441 +462 @@
 
     if ($webvar{fbassign} && $webvar{fbassign} eq 'y') {
+
+      # Tree navigation
+      my $crumbs = getBreadCrumbs($ip_dbh, $webvar{parent});
+      my @rcrumbs = reverse (@$crumbs);
+      $utilbar->param(breadcrumb => \@rcrumbs);
+
       $cidr = new NetAddr::IP $webvar{block};
       $alloc_from = new NetAddr::IP $webvar{allocfrom};
@@ -685 +712 @@
       $page->param(alloctype => $disp_alloctypes{$webvar{alloctype}});
       $page->param(custid => $webvar{custid});
+
       # breadcrumbs lite!  provide at least a link to the parent of the block we just allocated.
       my $binfo = getBlockData($ip_dbh, $webvar{parent});
       $page->param(parentid => $webvar{parent});
       $page->param(parentblock => $binfo->{block});
+
+      # Full breadcrumbs
+      my $crumbs = getBreadCrumbs($ip_dbh, $webvar{parent});
+      my @rcrumbs = reverse (@$crumbs);
+      $utilbar->param(breadcrumb => \@rcrumbs);
+
       if ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) {
         $page->param(billinguser => $webvar{billinguser});
@@ -829 +863 @@
   $page->param(id       => $webvar{id});
   $page->param(basetype => $webvar{basetype});
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $blockinfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
 
   # Clean up extra whitespace on alloc type.  Mainly a legacy-data cleanup.

trunk/ipdb.css

@@ -56 +56 @@
         top: 2px;
         text-align: right;
+}
+#breadcrumb {
+        font-size: 13px;
+        font-weight: bold;
+        position: absolute;
+        top: 2px;
 }
 #adminlink {

trunk/templates/header.tmpl

@@ -44 +44 @@
 
 <div id="main">
-<div id="utils">
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=nodesearch">Find by connection point</a>
-</div>