Changeset 469

Timestamp:

08/12/10 18:00:54 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Checkpoint - convert editDisplay.html to template
Still need to finish type dropdown
Still need to clean up formatting, tr/div/form nesting/classes,
etc around buttons and restricted data
See #3

Location:

branches/htmlform

Files:

• cgi-bin/main.cgi (modified) (7 diffs)
• ipdb.css (modified) (1 diff)
• templates/edit.tmpl (added)

branches/htmlform/cgi-bin/main.cgi

@@ -982 +982 @@
 ##fixme
 # Needs thinking.  Have to allow changes to city to correct errors, no?
+# Also have areas where a routed block at a POP serves "many" cities/towns/named crossroads
   $html =~ s/\$\$BLOCK\$\$/$webvar{block}/g;
+
+# cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,swip
+
+$page->param(block => $webvar{block});
+
+$page->param(custid => $data[1]);
+$page->param(city => $data[3]);
+$page->param(circid => $data[4]);
+$page->param(desc => $data[5]);
+$page->param(notes => $data[6]);
 
   if ($IPDBacl{$authuser} =~ /c/) {
     $html =~ s/\$\$CUSTID\$\$/<input type=text name=custid value="$data[1]" maxlength=15 class="regular">/;
-
-# Screw it.  Changing allocation types gets very ugly VERY quickly- especially
-# with the much longer list of allocation types.
-# We'll just show what type of block it is.
-
-# this has now been Requested, so here goes.
-
 ##fixme The check here should be built from the database
+# Need to expand to support pool types too
     if ($data[2] =~ /^.[ne]$/) {
+$page->param(changetype => $IPDBacl{$authuser} =~ /c/);
+$page->param(alloctype => [
+                { selme => ($data[2] eq 'me'), type => "me", disptype => "Dialup netblock" },
+                { selme => ($data[2] eq 'de'), type => "de", disptype => "Dynamic DSL netblock" },
+                { selme => ($data[2] eq 'ce'), type => "ce", disptype => "Dynamic cable netblock" },
+                { selme => ($data[2] eq 'we'), type => "we", disptype => "Dynamic wireless netblock" },
+                { selme => ($data[2] eq 'cn'), type => "cn", disptype => "Customer netblock" },
+                { selme => ($data[2] eq 'en'), type => "en", disptype => "End-use netblock" },
+                { selme => ($data[2] eq 'in'), type => "in", disptype => "Internal netblock" },
+                ]
+        );
+
       # Block that can be changed
       my $blockoptions = "<select name=alloctype><option".
@@ -1010 +1027 @@
     }
 ## node hack
+##fixme:  this whole hack needs cleanup and generalization for all alloctypes
   $sth = $ip_dbh->prepare("SELECT node_id FROM noderef WHERE block='$webvar{block}'");
   $sth->execute;
   my ($nodeid) = $sth->fetchrow_array();
+$page->param(havenodeid => $nodeid);
+$page->param(typesupportsnodes => ($data[2] eq 'fr' || $data[2] eq 'bi'));
   if ($nodeid) {
     $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
     $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"<br>\n";
     my $nodes = "<select name=node>\n";
+    my @nodelist;
     while (my ($nid,$nname) = $sth->fetchrow_array()) {
       $nodes .= "<option".($nodeid == $nid ? ' selected' : '')." value='$nid'>$nname</option>\n";
-    }
+      my %row = (
+        selme => ($nodeid == $nid),
+        nodeid => $nid,
+        nodename => $nname,
+        );
+      push (@nodelist, \%row);
+    }
+$page->param(nodelist => \@nodelist);
     $nodes .= "</select>\n";
     $html =~ s/\$\$NODE\$\$/$nodes/;
@@ -1061 +1089 @@
   }
   my ($lastmod,undef) = split /\s+/, $data[7];
-  $html =~ s/\$\$LASTMOD\$\$/$lastmod/g;
+  $page->param(lastmod => $lastmod);
 
 ## Hack time!  SWIP isn't going to stay, so I'm not going to integrate it with ACLs.
@@ -1077 +1105 @@
   # Check to see if we can display sensitive data
   my $privdata = '';
+$page->param(nocling => $IPDBacl{$authuser} =~ /s/);
+$page->param(privdata => $data[8]);
+
   if ($IPDBacl{$authuser} =~ /s/) {
     $privdata = qq(<tr class="color).($i%2).qq("><td class=heading>Restricted data:</td>).
@@ -1089 +1120 @@
   # can't leave the submit buttons there.
   my $updok = '';
+$page->param(maychange => $IPDBacl{$authuser} =~ /c/);
   if ($IPDBacl{$authuser} =~ /c/) {
     $updok = qq(<tr class="color).($i%2).qq("><td colspan=2><div class="center">).
@@ -1098 +1130 @@
 
   my $delok = '';
+$page->param(maydel => $IPDBacl{$authuser} =~ /d/);
   if ($IPDBacl{$authuser} =~ /d/) {
     $delok = qq(<form method="POST" action="main.cgi">
@@ -1109 +1142 @@
   $html =~ s/\$\$DELOK\$\$/$delok/;
 
-  print $html;
+#  print $html;
 
 } # edit()

branches/htmlform/ipdb.css

@@ -96 +96 @@
         font-family: Verdana, Arial, Helvetica, sans-serif;
 }
-tr.row0 {
+/* for reasons of Please The Validation Gods, these may be applied to
+   things that are not technically table rows */
+.row0 {
         background-color: #D0E0E0;
         font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 90%;
 }
-tr.row1 {
+.row1 {
         background-color: #A8C4D0;
         font-family: Verdana, Arial, Helvetica, sans-serif;