Changeset 245 for branches/stable

Timestamp:

05/05/05 11:15:21 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Add "Last modified" timestamp display to edit page

Location:

branches/stable

Files:

• cgi-bin/main.cgi (modified) (4 diffs)
• editDisplay.html (modified) (1 diff)

branches/stable/cgi-bin/main.cgi

@@ -1113 +1113 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,type,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes,swip from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,swip from allocations where cidr='$webvar{block}'"
   }
 
@@ -1174 +1174 @@
     $html =~ s/\$\$NOTES\$\$/$data[6]/g;
   }
+  my ($lastmod,undef) = split /\s+/, $data[7];
+  $html =~ s/\$\$LASTMOD\$\$/$lastmod/g;
 
 ## Hack time!  SWIP isn't going to stay, so I'm not going to integrate it with ACLs.
@@ -1179 +1181 @@
   $html =~ s/\$\$SWIP\$\$/N\/A/;
 } else {
-  my $tmp = (($data[7] eq 'n') ? '<input type=checkbox name=swip>' : 
+  my $tmp = (($data[8] eq 'n') ? '<input type=checkbox name=swip>' : 
         '<input type=checkbox name=swip checked=yes>');
   $html =~ s/\$\$SWIP\$\$/$tmp/;
 }
+
+  # Allows us to "correctly" colour backgrounds in table
+  my $i=1;
 
   # More ACL trickery - we can live with forms that don't submit,
@@ -1188 +1193 @@
   # can't leave the submit buttons there.
   my $updok = '';
-  my $i=2;
   if ($IPDBacl{$authuser} =~ /c/) {
     $updok = qq(<tr class="color$i"><td colspan=2 class=regular><div class="center">).
         qq(<input type="submit" value=" Update this block " class="regular">).
         "</div></td></tr></form>\n";
-    $i--;
+    $i++;
   }
   $html =~ s/\$\$UPDOK\$\$/$updok/g;

branches/stable/editDisplay.html

@@ -16 +16 @@
 <tr class="color2"><td class=heading>SWIPed?:</td><td class=regular>$$SWIP$$</td></tr>
 
-<tr class="color1"><td class="heading">Circuit ID:</td><td class="regular">$$CIRCID$$</td></tr>
+<tr class="color1"><td class=heading>Last modified:</td><td class=regular>$$LASTMOD$$</td></tr>
 
-<tr class="color2"><td class="heading">Description/Name:</td><td class="regular">$$DESC$$</td></tr>
+<tr class="color2"><td class="heading">Circuit ID:</td><td class="regular">$$CIRCID$$</td></tr>
 
-<tr class="color1"><td class="heading" valign="top">Notes:</td><td class="regular">$$NOTES$$</td></tr>
+<tr class="color1"><td class="heading">Description/Name:</td><td class="regular">$$DESC$$</td></tr>
+
+<tr class="color2"><td class="heading" valign="top">Notes:</td><td class="regular">$$NOTES$$</td></tr>
 
 $$UPDOK$$