Changeset 75


Ignore:
Timestamp:
11/16/04 15:24:12 (20 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Backports from /trunk r74:

  • Addition of CircuitID field WARNING: This REQUIRES changes to the allocations and poolips tables!!
  • New SQL schema definition
  • Display bugfix
Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/assign.html

    r44 r75  
    9191<td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$</td>
    9292</tr><tr class="color1">
     93<td>Cicruit ID:&nbsp;</td><td><input name=circid size=40></td>
     94</tr><tr class="color2">
    9395<td>Description/Name:&nbsp;</td><td><input name="desc" size=40></td>
     96</tr><tr class="color1">
     97<td>Notes:&nbsp;</td><td><textarea name="notes" rows="3" cols="40"></textarea></td>
    9498</tr><tr class="color2">
    95 <td>Notes:&nbsp;</td><td><textarea name="notes" rows="3" cols="40"></textarea></td>
    96 </tr><tr class="color1">
    9799<td class="center" colspan="2"><input type="submit" value="  Assign  "></td>
    98100<input type="hidden" name="action" value="confirm">

  • branches/stable/cgi-bin/ipdb.psql

    r59 r75  
    2323
    2424--
    25 -- TOC Entry ID 2 (OID 25848)
    26 --
    27 -- Name: allocations Type: TABLE Owner: ipdb
    28 --
    29 
    30 CREATE TABLE "allocations" (
    31         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
    32         "custid" character varying(16) DEFAULT '',
    33         "type" character(2) DEFAULT '',
    34         "city" character varying(30) DEFAULT '',
    35         "description" character varying(64) DEFAULT '',
    36         "notes" text,
    37         "maskbits" integer DEFAULT 128,
    38         Constraint "allocations_pkey" Primary Key ("cidr")
    39 );
    40 
    41 --
    42 -- TOC Entry ID 3 (OID 25848)
    43 --
    44 -- Name: allocations Type: ACL Owner:
    45 --
    46 
    47 REVOKE ALL on "allocations" from PUBLIC;
    48 GRANT ALL on "allocations" to "kdeugau";
    49 GRANT ALL on "allocations" to "ipdb";
    50 
    51 --
    52 -- TOC Entry ID 4 (OID 25854)
     25-- TOC Entry ID 2 (OID 25854)
    5326--
    5427-- Name: customers Type: TABLE Owner: ipdb
    … …  
    7144
    7245--
    73 -- TOC Entry ID 5 (OID 25854)
     46-- TOC Entry ID 3 (OID 25854)
    7447--
    7548-- Name: customers Type: ACL Owner:
    … …  
    8154
    8255--
    83 -- TOC Entry ID 6 (OID 25866)
     56-- TOC Entry ID 4 (OID 25872)
     57--
     58-- Name: masterblocks Type: TABLE Owner: ipdb
     59--
     60
     61CREATE TABLE "masterblocks" (
     62        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
     63        Constraint "masterblocks_pkey" Primary Key ("cidr")
     64);
     65
     66--
     67-- TOC Entry ID 5 (OID 25872)
     68--
     69-- Name: masterblocks Type: ACL Owner:
     70--
     71
     72REVOKE ALL on "masterblocks" from PUBLIC;
     73GRANT ALL on "masterblocks" to "kdeugau";
     74GRANT ALL on "masterblocks" to "ipdb";
     75
     76--
     77-- TOC Entry ID 6 (OID 25875)
     78--
     79-- Name: routed Type: TABLE Owner: ipdb
     80--
     81
     82CREATE TABLE "routed" (
     83        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
     84        "maskbits" integer DEFAULT 128,
     85        "city" character varying(30) DEFAULT '',
     86        Constraint "routed_pkey" Primary Key ("cidr")
     87);
     88
     89--
     90-- TOC Entry ID 7 (OID 25875)
     91--
     92-- Name: routed Type: ACL Owner:
     93--
     94
     95REVOKE ALL on "routed" from PUBLIC;
     96GRANT ALL on "routed" to "kdeugau";
     97GRANT ALL on "routed" to "ipdb";
     98
     99--
     100-- TOC Entry ID 8 (OID 31131)
     101--
     102-- Name: temp Type: TABLE Owner: ipdb
     103--
     104
     105CREATE TABLE "temp" (
     106        "ofs" integer
     107);
     108
     109--
     110-- TOC Entry ID 9 (OID 31131)
     111--
     112-- Name: temp Type: ACL Owner:
     113--
     114
     115REVOKE ALL on "temp" from PUBLIC;
     116GRANT ALL on "temp" to "kdeugau";
     117GRANT ALL on "temp" to "ipdb";
     118
     119--
     120-- TOC Entry ID 10 (OID 73917)
     121--
     122-- Name: searchme Type: VIEW Owner: ipdb
     123--
     124
     125CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.ptype, poolips.city, poolips.description FROM poolips;
     126
     127--
     128-- TOC Entry ID 11 (OID 73917)
     129--
     130-- Name: searchme Type: ACL Owner:
     131--
     132
     133REVOKE ALL on "searchme" from PUBLIC;
     134GRANT ALL on "searchme" to "kdeugau";
     135GRANT ALL on "searchme" to "ipdb";
     136
     137--
     138-- TOC Entry ID 12 (OID 91065)
     139--
     140-- Name: freeblocks Type: TABLE Owner: ipdb
     141--
     142
     143CREATE TABLE "freeblocks" (
     144        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
     145        "maskbits" integer DEFAULT 128,
     146        "city" character varying(30) DEFAULT '',
     147        "routed" character(1) DEFAULT 'n',
     148        Constraint "freeblocks_pkey" Primary Key ("cidr")
     149);
     150
     151--
     152-- TOC Entry ID 13 (OID 91065)
     153--
     154-- Name: freeblocks Type: ACL Owner:
     155--
     156
     157REVOKE ALL on "freeblocks" from PUBLIC;
     158GRANT ALL on "freeblocks" to "kdeugau";
     159GRANT ALL on "freeblocks" to "ipdb";
     160
     161--
     162-- TOC Entry ID 14 (OID 92444)
    84163--
    85164-- Name: poolips Type: TABLE Owner: ipdb
    … …  
    93172        "ptype" character(1) DEFAULT 'c' NOT NULL,
    94173        "available" character(1) DEFAULT 'y',
    95         "notes" text,
     174        "notes" text DEFAULT '',
    96175        "description" character varying(64) DEFAULT '',
     176        "circuitid" character varying(128) DEFAULT '',
    97177        CHECK (((available = 'y'::bpchar) OR (available = 'n'::bpchar))),
    98178        Constraint "poolips_pkey" Primary Key ("ip")
    … …  
    100180
    101181--
    102 -- TOC Entry ID 7 (OID 25866)
     182-- TOC Entry ID 15 (OID 92444)
    103183--
    104184-- Name: poolips Type: ACL Owner:
    … …  
    110190
    111191--
    112 -- TOC Entry ID 8 (OID 25872)
    113 --
    114 -- Name: masterblocks Type: TABLE Owner: ipdb
    115 --
    116 
    117 CREATE TABLE "masterblocks" (
    118         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
    119         Constraint "masterblocks_pkey" Primary Key ("cidr")
    120 );
    121 
    122 --
    123 -- TOC Entry ID 9 (OID 25872)
    124 --
    125 -- Name: masterblocks Type: ACL Owner:
    126 --
    127 
    128 REVOKE ALL on "masterblocks" from PUBLIC;
    129 GRANT ALL on "masterblocks" to "kdeugau";
    130 GRANT ALL on "masterblocks" to "ipdb";
    131 
    132 --
    133 -- TOC Entry ID 10 (OID 25875)
    134 --
    135 -- Name: routed Type: TABLE Owner: ipdb
    136 --
    137 
    138 CREATE TABLE "routed" (
    139         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
     192-- TOC Entry ID 16 (OID 92725)
     193--
     194-- Name: allocations Type: TABLE Owner: ipdb
     195--
     196
     197CREATE TABLE "allocations" (
     198        "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
     199        "custid" character varying(16) DEFAULT '',
     200        "type" character(2) DEFAULT '',
     201        "city" character varying(30) DEFAULT '',
     202        "description" character varying(64) DEFAULT '',
     203        "notes" text DEFAULT '',
    140204        "maskbits" integer DEFAULT 128,
    141         "city" character varying(30) DEFAULT '',
    142         Constraint "routed_pkey" Primary Key ("cidr")
    143 );
    144 
    145 --
    146 -- TOC Entry ID 11 (OID 25875)
    147 --
    148 -- Name: routed Type: ACL Owner:
    149 --
    150 
    151 REVOKE ALL on "routed" from PUBLIC;
    152 GRANT ALL on "routed" to "kdeugau";
    153 GRANT ALL on "routed" to "ipdb";
    154 
    155 --
    156 -- TOC Entry ID 12 (OID 31131)
    157 --
    158 -- Name: temp Type: TABLE Owner: ipdb
    159 --
    160 
    161 CREATE TABLE "temp" (
    162         "ofs" integer
    163 );
    164 
    165 --
    166 -- TOC Entry ID 13 (OID 31131)
    167 --
    168 -- Name: temp Type: ACL Owner:
    169 --
    170 
    171 REVOKE ALL on "temp" from PUBLIC;
    172 GRANT ALL on "temp" to "kdeugau";
    173 GRANT ALL on "temp" to "ipdb";
    174 
    175 --
    176 -- TOC Entry ID 14 (OID 73917)
    177 --
    178 -- Name: searchme Type: VIEW Owner: ipdb
    179 --
    180 
    181 CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.ptype, poolips.city, poolips.description FROM poolips;
    182 
    183 --
    184 -- TOC Entry ID 15 (OID 73917)
    185 --
    186 -- Name: searchme Type: ACL Owner:
    187 --
    188 
    189 REVOKE ALL on "searchme" from PUBLIC;
    190 GRANT ALL on "searchme" to "kdeugau";
    191 GRANT ALL on "searchme" to "ipdb";
    192 
    193 --
    194 -- TOC Entry ID 16 (OID 91065)
    195 --
    196 -- Name: freeblocks Type: TABLE Owner: ipdb
    197 --
    198 
    199 CREATE TABLE "freeblocks" (
    200         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL,
    201         "maskbits" integer DEFAULT 128,
    202         "city" character varying(30) DEFAULT '',
    203         "routed" character(1) DEFAULT 'n',
    204         Constraint "freeblocks_pkey" Primary Key ("cidr")
    205 );
    206 
    207 --
    208 -- TOC Entry ID 17 (OID 91065)
    209 --
    210 -- Name: freeblocks Type: ACL Owner:
    211 --
    212 
    213 REVOKE ALL on "freeblocks" from PUBLIC;
    214 GRANT ALL on "freeblocks" to "kdeugau";
    215 GRANT ALL on "freeblocks" to "ipdb";
    216 
     205        "circuitid" character varying(128) DEFAULT '',
     206        Constraint "allocations_pkey" Primary Key ("cidr")
     207);
     208
     209--
     210-- TOC Entry ID 17 (OID 92725)
     211--
     212-- Name: allocations Type: ACL Owner:
     213--
     214
     215REVOKE ALL on "allocations" from PUBLIC;
     216GRANT ALL on "allocations" to "kdeugau";
     217GRANT ALL on "allocations" to "ipdb";
     218

  • branches/stable/cgi-bin/main.cgi

    r71 r75  
    735735  my $count = 0;
    736736  while (my @data = $sth->fetchrow_array) {
    737     # pool,ip,custid,city,ptype,available,notes,description
     737    # pool,ip,custid,city,ptype,available,notes,description,circuitid
    738738    # If desc is null, make it not null.  <g>
    739739    if ($data[7] eq '') {
    … …  
    934934  $html =~ s|\$\$CITY\$\$|$webvar{city}|g;
    935935  $html =~ s|\$\$CUSTID\$\$|$webvar{custid}|g;
     936  $html =~ s|\$\$CIRCID\$\$|$webvar{circid}|g;
    936937  $webvar{desc} = desanitize($webvar{desc});
    937938  $webvar{notes} = desanitize($webvar{notes});
    … …  
    977978
    978979    $sth = $ip_dbh->prepare("update poolips set custid='$webvar{custid}',".
    979         "city='$webvar{city}',available='n',description='$webvar{desc}'".
     980        "city='$webvar{city}',available='n',description='$webvar{desc}',".
     981        "circuitid='$webvar{circid}'".
    980982        " where ip='$cidr'");
    981983    $sth->execute;
    … …  
    10291031          $sth = $ip_dbh->prepare("insert into allocations values ('$webvar{fullcidr}',".
    10301032            "'$webvar{custid}','$webvar{alloctype}','$webvar{city}','$webvar{desc}',".
    1031             "'$webvar{notes}',".$cidr->masklen.")");
     1033            "'$webvar{notes}',".$cidr->masklen.",'$webvar{circid}')");
    10321034          $sth->execute;
    10331035        } # routing vs non-routing netblock
    … …  
    10951097          $sth = $ip_dbh->prepare("insert into allocations values ('$webvar{fullcidr}',".
    10961098            "'$webvar{custid}','$webvar{alloctype}','$webvar{city}',".
    1097             "'$webvar{desc}','$webvar{notes}',".$cidr->masklen.")");
     1099            "'$webvar{desc}','$webvar{notes}',".$cidr->masklen.",'$webvar{circid}')");
    10981100          $sth->execute;
    10991101        } # done with netblock alloctype != rr
    … …  
    11181120        # have to insert all pool IPs into poolips table as "unallocated".
    11191121        $sth = $ip_dbh->prepare("insert into poolips values ('$webvar{fullcidr}',".
    1120           " ?, '6750400', '$webvar{city}', '$pooltype', 'y', '')");
     1122          " ?, '6750400', '$webvar{city}', '$pooltype', 'y', '', '', '')");
    11211123        my @poolip_list = $cidr->hostenum;
    11221124        for (my $i=1; $i<=$#poolip_list; $i++) {
    … …  
    12051207  # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
    12061208  if ($webvar{block} =~ /\/32$/) {
    1207     $sql = "select ip,custid,ptype,city,description,notes from poolips where ip='$webvar{block}'";
     1209    $sql = "select ip,custid,ptype,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
    12081210  } else {
    1209     $sql = "select cidr,custid,type,city,description,notes from allocations where cidr='$webvar{block}'"
     1211    $sql = "select cidr,custid,type,city,circuitid,description,notes from allocations where cidr='$webvar{block}'"
    12101212  }
    12111213
    … …  
    12581260  # These can be modified, although CustID changes may get ignored.
    12591261  $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
    1260   $html =~ s/\$\$DESC\$\$/$data[4]/g;
    1261   $html =~ s/\$\$NOTES\$\$/$data[5]/g;
     1262  $html =~ s/\$\$TYPE\$\$/$data[2]/g;
     1263  $html =~ s/\$\$CIRCID\$\$/$data[4]/g;
     1264  $html =~ s/\$\$DESC\$\$/$data[5]/g;
     1265  $html =~ s/\$\$NOTES\$\$/$data[6]/g;
    12621266
    12631267  print $html;
    … …  
    12801284    my $sql;
    12811285    if (my $pooltype = ($webvar{alloctype} =~ /^([cdms])i$/) ) {
    1282       $sql = "update poolips set custid='$webvar{custid}',".
    1283         "notes='$webvar{notes}',description='$webvar{desc}' ".
     1286      $sql = "update poolips set custid='$webvar{custid}',notes='$webvar{notes}',".
     1287        "circuitid='$webvar{circid}',description='$webvar{desc}' ".
    12841288        "where ip='$webvar{block}'";
    12851289    } else {
    12861290      $sql = "update allocations set custid='$webvar{custid}',".
    12871291        "description='$webvar{desc}',notes='$webvar{notes}',city='$webvar{city}',".
    1288         "type='$webvar{alloctype}' where cidr='$webvar{block}'";
     1292        "type='$webvar{alloctype}',circuitid='$webvar{circid}' where cidr='$webvar{block}'";
    12891293    }
    12901294syslog "debug", $sql;
    … …  
    13111315  $html =~ s/\$\$TYPEFULL\$\$/$full_alloc_types{$webvar{alloctype}}/g;
    13121316  $html =~ s/\$\$CUSTID\$\$/$webvar{custid}/g;
     1317  $html =~ s/\$\$CIRCID\$\$/$webvar{circid}/g;
    13131318  $html =~ s/\$\$DESC\$\$/$webvar{desc}/g;
    13141319  $html =~ s/\$\$NOTES\$\$/$webvar{notes}/g;
    … …  
    13351340  }
    13361341
    1337   my ($cidr, $custid, $type, $city, $desc, $notes, $alloctype);
     1342  my ($cidr, $custid, $type, $city, $circid, $desc, $notes, $alloctype);
    13381343
    13391344  if ($webvar{alloctype} eq 'rr') {
    … …  
    13491354    $custid = "N/A";
    13501355    $alloctype = $webvar{alloctype};
     1356    $circid = "N/A";
    13511357    $desc = "N/A";
    13521358    $notes = "N/A";
    … …  
    13571363    $custid = "N/A";
    13581364    $alloctype = $webvar{alloctype};
     1365    $circid = "N/A";
    13591366    $desc = "N/A";
    13601367    $notes = "N/A";
    … …  
    13621369
    13631370    # Unassigning a static IP
    1364     my $sth = $ip_dbh->prepare("select ip,custid,city,ptype,notes from poolips".
     1371    my $sth = $ip_dbh->prepare("select ip,custid,city,ptype,notes,circuitid from poolips".
    13651372        " where ip='$webvar{block}'");
    13661373    $sth->execute();
    13671374#  croak $sth->errstr() if($sth->errstr());
    13681375
    1369     $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes);
     1376    $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes, \$circid);
    13701377    $sth->fetch() || croak $sth->errstr;
    13711378
    … …  
    13741381  } else { # done with alloctype=[sdcmw]i
    13751382
    1376     my $sth = $ip_dbh->prepare("select cidr,custid,type,city,description,notes from ".
     1383    my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes from ".
    13771384        "allocations where cidr='$webvar{block}'");
    13781385    $sth->execute();
    13791386#       croak $sth->errstr() if($sth->errstr());
    13801387
    1381     $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$desc, \$notes);
    1382     $sth->fetch() || croak $sth->errstr;
     1388    $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$circid, \$desc, \$notes);
     1389    $sth->fetch() || carp $sth->errstr;
    13831390  } # end cases for different alloctypes
    13841391
    … …  
    13901397  $html =~ s|\$\$CITY\$\$|$city|g;
    13911398  $html =~ s|\$\$CUSTID\$\$|$custid|g;
     1399  $html =~ s|\$\$CIRCID\$\$|$circid|g;
    13921400  $html =~ s|\$\$DESC\$\$|$desc|g;
    13931401  $html =~ s|\$\$NOTES\$\$|$notes|g;

  • branches/stable/confirm.html

    r4 r75  
    1515<td>Customer ID:&nbsp</td><td>&nbsp;$$CUSTID$$<input type="hidden" name="custid" value="$$CUSTID$$"></td>
    1616</tr><tr class="color2">
     17<td valign="top">Cicruit ID:&nbsp</td><td>&nbsp;$$CIRCID$$<input type="hidden" name="circid" value="$$CIRCID$$"></td>
     18</tr><tr class="color1">
    1719<td valign="top">Description/name:&nbsp</td><td>&nbsp;$$DESC$$<input type="hidden" name="desc" value="$$DESC$$"></td>
    18 </tr><tr class="color1">
     20</tr><tr class="color2">
    1921<td valign="top">Notes:&nbsp</td><td>&nbsp;$$NOTES$$<input type="hidden" name="notes" value="$$NOTES$$"></td>
    2022</tr>
    … …  
    2224<input type="hidden" name="alloctype" value="$$ALLOC_TYPE$$">
    2325<input type="hidden" name="action" value="$$ACTION$$">
    24 <tr class="color2">
     26<tr class="color1">
    2527<td class="center" colspan="2">
    2628<input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">

  • branches/stable/confirmRemove.html

    r4 r75  
    1 <div class="heading">Allocation info updated:</div>
     1<div class="heading">Please confirm:</div>
    22<div class="indent">
    33<table class="regular" bgcolor="white" cellspacing="1" cellpadding="1">
    … …  
    77<tr class="color1"><td>Type:</td><td>$$TYPEFULL$$<input type=hidden name=alloctype value="$$ALLOCTYPE$$"></td></tr>
    88<tr class="color2"><td>Customer ID:</td><td>$$CUSTID$$</td></tr>
     9<tr class="color2"><td>Circuit ID:</td><td>$$CIRCID$$</td></tr>
    910<tr class="color1"><td valign="top">Description/Name:</td><td>$$DESC$$</td></tr>
    1011<tr class="color2"><td valign="top">Notes:</td><td>$$NOTES$$</td></tr>

  • branches/stable/editDisplay.html

    r35 r75  
    66<input type="hidden" name="block" value="$$BLOCK$$">
    77
    8 <tr class="color1"><td class=heading>IP block:</td><td colspan=2 class="regular">$$BLOCK$$</td></tr>
     8<tr class="color1"><td class=heading>IP block:</td><td class="regular">$$BLOCK$$</td></tr>
    99
    10 <tr class="color2"><td class=heading>City:</td><td colspan=2 class="regular">
     10<tr class="color2"><td class=heading>City:</td><td class="regular">
    1111<input type=text name=city value="$$CITY$$"></td></tr>
    1212
    13 <tr class="color1"><td class=heading>Type:</td><td colspan=2 class=regular>$$TYPESELECT$$</td></tr>
     13<tr class="color1"><td class=heading>Type:</td><td class=regular>$$TYPESELECT$$</td></tr>
    1414
    15 <tr class="color2"><td class=heading>CustID:</td><td colspan=2 class="regular">
     15<tr class="color2"><td class=heading>CustID:</td><td class="regular">
    1616<input type=text name=custid value="$$CUSTID$$" maxlength=15 class="regular"></td></tr>
    1717
    18 <tr class="color1"><td class="heading">Description/Name:</td><td colspan=2 class="regular">
     18<tr class="color1"><td class="heading">Circuit ID:</td><td class="regular">
     19<input type="text" name="circid" value="$$CIRCID$$" maxlength=64 size=64 class="regular"></td></tr>
     20
     21<tr class="color2"><td class="heading">Description/Name:</td><td class="regular">
    1922<input type="text" name="desc" value="$$DESC$$" maxlength=64 size=64 class="regular"></td></tr>
    2023
    21 <tr class="color2"><td class="heading" valign="top">Notes:</td><td class="regular">
     24<tr class="color1"><td class="heading" valign="top">Notes:</td><td class="regular">
    2225<textarea rows="8" cols="64" name="notes" class="regular">$$NOTES$$</textarea></td></tr>
    2326
    24 <tr class="color1"><td colspan=2 class=regular><div class="center">
     27<tr class="color2"><td colspan=2 class=regular><div class="center">
    2528<input type="submit" value=" Update this block " class="regular">
    2629</div></td></tr></form>
    2730<form method="POST" action="main.cgi">
    28 <tr class=color2><td colspan=2 class="regular"><div class=center>
     31<tr class="color1"><td colspan=2 class="regular"><div class=center>
    2932<input type="hidden" name="action" value="delete">
    3033<input type="hidden" name="block" value="$$BLOCK$$">
     34<input type="hidden" name="alloctype" value="$$TYPE$$">
    3135<input type=submit value=" Delete this block ">
    3236</div></td></tr>

  • branches/stable/updated.html

    r4 r75  
    66<tr class="color1"><td>Type:</td><td>$$TYPEFULL$$</td></tr>
    77<tr class="color2"><td>Customer ID:</td><td>$$CUSTID$$</td></tr>
    8 <tr class="color1"><td valign="top">Description/Name:</td><td>$$DESC$$</td></tr>
    9 <tr class="color2"><td valign="top">Notes:</td><td>$$NOTES$$</td></tr>
     8<tr class="color1"><td>Circuit ID:</td><td>$$CIRCID$$</td></tr>
     9<tr class="color2"><td valign="top">Description/Name:</td><td>$$DESC$$</td></tr>
     10<tr class="color1"><td valign="top">Notes:</td><td>$$NOTES$$</td></tr>
    1011</table>
    1112</div>
Note: See TracChangeset for help on using the changeset viewer.