Changeset 511


Ignore:
Timestamp:
09/27/12 18:13:16 (11 years ago)
Author:
Kris Deugau
Message:

/branches/htmlform

Final prep for merge back to trunk.

  • Remove lockin on /ip/ web path as with /branches/stable r507.
  • Fix a buglet with the body text color.
  • Remove the lingering header and footer template files

See #3.

Location:
branches/htmlform
Files:
2 deleted
28 edited

Legend:

Unmodified
Added
Removed
  • branches/htmlform/INSTALL

    r440 r511  
    65655) Configure your webserver to call the IPDB scripts at an appropriate
    6666web path.  A webroot pointing to the HTML files (first level under
    67 the ipdb-#VERSION#/ tarball directory, or /usr/local/lib/ipdb-#VERSION#) 
    68 with a symlink or alias for ip/ -> . should work fine;  a server alias
    69 under an existing virtual host should work as well.
     67the ipdb-#VERSION#/ tarball directory, or /usr/local/lib/ipdb-#VERSION#)
     68should work fine;  a server alias under an existing virtual host should
     69work as well.
    7070
    71 Note that all URLs referenced internally currently assume they will be
    72 presented at http://host/ip/;  you cannot put the IPDB at
    73 http://host/noc/misc/ipdb/.
     71Set $IPDB::webpath (the web path to your IPDB install) in MyIPDB.pm.
     72Straight out of the tarball it should work at the webroot, but if you
     73want it in a subdirectory, you'll need to set this variable to get all
     74of the internal links to behave properly.
    7475
    7576The directory containing the HTML and scripts must have at least the
    7677following Apache directives (or other server equivalent) set:
    7778
    78   Options ExecCGI IncludesNoEXEC FollowSymlinks
     79  Options ExecCGI IncludesNoEXEC
    7980
    80816) User lists can be maintained two basic ways:
  • branches/htmlform/Makefile

    r505 r511  
    3232        \
    3333        alloctypes.html \
    34         footer.inc \
    35         header.inc help.html index.shtml ipdb.css \
     34        help.html index.shtml ipdb.css \
    3635        images/logo.png \
    3736        \
     
    4948HTML = \
    5049        alloctypes.html \
    51         footer.inc \
    52         header.inc help.html index.shtml ipdb.css
     50        help.html index.shtml ipdb.css
    5351
    5452IMAGES = images/logo.png
  • branches/htmlform/alloctypes.html

    r498 r511  
    44        <title>IP Database - Allocation Types</title>
    55        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    6         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    7         <link rel="stylesheet" type="text/css" href="/ip/local.css">
     6        <link rel="stylesheet" type="text/css" href="ipdb.css">
     7        <link rel="stylesheet" type="text/css" href="local.css">
    88</head>
    99
  • branches/htmlform/cgi-bin/MyIPDB.pm

    r437 r511  
    2222# DB host is optional.
    2323my $dbhost = 'ipdb-db';
     24
     25# Quick workaround for fixed web path.  Set this to the absolute web path to
     26# your IPDB install, or leave blank for installation at the webroot.
     27$IPDB::webpath = '';
    2428
    2529# Set some globals declared in IPDB.pm.  Most of these only affect mailNotify().
  • branches/htmlform/cgi-bin/admin.cgi

    r505 r511  
    518518
    519519##fixme:  make me a footer param!
    520 print qq(<hr><div><a href="/ip/">Back</a> to main interface</div>\n);
     520print qq(<hr><div><a href="$IPDB::webpath/">Back</a> to main interface</div>\n);
    521521
    522522# We print the footer here, so we don't have to do it elsewhere.
  • branches/htmlform/cgi-bin/main.cgi

    r505 r511  
    7777$header->param(version => $IPDB::VERSION);
    7878$header->param(addperm => $IPDBacl{$authuser} =~ /a/);
     79$header->param(webpath => $IPDB::webpath);
    7980print "Content-type: text/html\n\n", $header->output;
    8081
     
    208209# can't do this yet, too many blowups
    209210#print "Content-type: text/html\n\n", $header->output;
    210 
     211$page->param(webpath => $IPDB::webpath);
    211212print $page->output;
    212213
    213214# include the admin tools link in the output?
    214215$footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
    215 
     216$footer->param(webpath => $IPDB::webpath);
    216217print $footer->output;
    217218
  • branches/htmlform/help.html

    r498 r511  
    44        <title>IP Database Quick Help</title>
    55        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    6         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    7         <link rel="stylesheet" type="text/css" href="/ip/local.css">
     6        <link rel="stylesheet" type="text/css" href="ipdb.css">
     7        <link rel="stylesheet" type="text/css" href="local.css">
    88</head>
    99<body>
  • branches/htmlform/index.shtml

    r233 r511  
    1 <!--#include virtual="/ip/cgi-bin/main.cgi?action=index" -->
     1<!--#include virtual="cgi-bin/main.cgi?action=index" -->
  • branches/htmlform/ipdb.css

    r503 r511  
    7474body {
    7575  background-color: #ffffff;
    76   text-color: #000000;
     76  color: #000000;
    7777  font-family: helvetica;
    7878  margin: 0;
  • branches/htmlform/templates/addmaster.tmpl

    r472 r511  
    11<div class="indent">
    22<div class="heading">Add new master IP block</div><br>
    3 <form method="POST" action="/ip/cgi-bin/main.cgi">
     3<form method="POST" action="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi">
    44<fieldset><legend></legend>
    55<table class="regular" cellspacing="1" cellpadding="1">
  • branches/htmlform/templates/admin/aclerr.tmpl

    r483 r511  
    33<head>
    44        <title>Access denied</title>
    5         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    6         <link rel="stylesheet" type="text/css" href="/ip/local.css">
     5        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/ipdb.css">
     6        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/local.css">
    77</head>
    88<body>
  • branches/htmlform/templates/admin/alloc.tmpl

    r489 r511  
    2727<TMPL_LOOP NAME=citylist><option><TMPL_VAR NAME=city></option>
    2828</TMPL_LOOP></select>
    29 &nbsp;<a href="javascript:popNotes('/ip/cgi-bin/newcity.cgi')">Add new location</a>
     29&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newcity.cgi')">Add new location</a>
    3030</td>
    3131</tr>
  • branches/htmlform/templates/admin/header.tmpl

    r487 r511  
    33<head>
    44        <title>[IPDB admin tools]</title>
    5         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    6         <link rel="stylesheet" type="text/css" href="/ip/local.css">
    7         <script src="/ip/templates/widgets.js" type="text/javascript"></script>
     5        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/ipdb.css">
     6        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/local.css">
     7        <script src="<TMPL_VAR NAME=webpath>/templates/widgets.js" type="text/javascript"></script>
    88</head>
    99<body>
     
    1212<div>
    1313
    14 <TMPL_UNLESS mainpage><a href="/ip/cgi-bin/admin.cgi">Back</a> to main<hr></TMPL_UNLESS>
     14<TMPL_UNLESS mainpage><a href="<TMPL_VAR NAME=webpath>/cgi-bin/admin.cgi">Back</a> to main<hr></TMPL_UNLESS>
    1515
  • branches/htmlform/templates/assign.tmpl

    r463 r511  
    2727        <option><TMPL_VAR NAME=city></option></TMPL_LOOP>
    2828</select>
    29 &nbsp;<a href="javascript:popNotes('/ip/cgi-bin/newcity.cgi')">Add new location</a>
     29&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newcity.cgi')">Add new location</a>
    3030</td>
    3131</tr>
     
    6666        <option value="<TMPL_VAR NAME=nid>"><TMPL_VAR NAME=nname></option></TMPL_LOOP>
    6767</select>
    68 &nbsp;<a href="javascript:popNotes('/ip/cgi-bin/newnode.cgi')">Add new location</a>
     68&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new location</a>
    6969</td>
    7070</tr>
  • branches/htmlform/templates/footer.tmpl

    r464 r511  
    11<br>
    2 <TMPL_IF adminlink><div id="adminlink"><a href="/ip/cgi-bin/admin.cgi">Admin tools</a></div></TMPL_IF>
     2<TMPL_IF adminlink><div id="adminlink"><a href="<TMPL_VAR NAME=webpath>/cgi-bin/admin.cgi">Admin tools</a></div></TMPL_IF>
    33<!-- Done with the main div opened in the header template -->
    44</div>
  • branches/htmlform/templates/header.tmpl

    r458 r511  
    88        <meta http-equiv="content-type" content="text/html; charset=UTF-8">
    99        <title>[IP Database v<TMPL_VAR NAME=version>]</title>
    10         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    11         <link rel="stylesheet" type="text/css" href="/ip/local.css">
    12         <script src="/ip/templates/widgets.js" type="text/javascript"></script>
     10        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/ipdb.css">
     11        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/local.css">
     12        <script src="<TMPL_VAR NAME=webpath>/templates/widgets.js" type="text/javascript"></script>
    1313    </head>
    1414
     
    1717<div id="bodyheader">
    1818<div id="hlogo">
    19 <a href="/ip/index.shtml"><img src="/ip/images/logo.png" style="border:0;" alt="[ Logo ]"></a>
     19<a href="<TMPL_VAR NAME=webpath>/index.shtml"><img src="<TMPL_VAR NAME=webpath>/images/logo.png" style="border:0;" alt="[ Logo ]"></a>
    2020</div>
    2121<div id="homelink">
    22 <a href="/ip/index.shtml">[IP Database v<TMPL_VAR NAME=version> Home]</a>
     22<a href="<TMPL_VAR NAME=webpath>/index.shtml">[IP Database v<TMPL_VAR NAME=version> Home]</a>
    2323</div>
    2424</div>
     
    2626<div id="subheader">
    2727<div id="qsearch">
    28 <form method="post" action="/ip/cgi-bin/search.cgi">
     28<form method="post" action="<TMPL_VAR NAME=webpath>/cgi-bin/search.cgi">
    2929<fieldset><legend></legend>
    3030Quick Search:
     
    3434<input type="submit" value="Go!" class="heading">
    3535<input type="button" value=" Help? " onclick="openHelp()" class="regular">
    36 &nbsp; &nbsp;<a href="/ip/cgi-bin/search.cgi">Complex Search</a>
     36&nbsp; &nbsp;<a href="<TMPL_VAR NAME=webpath>/cgi-bin/search.cgi">Complex Search</a>
    3737</fieldset>
    3838</form>
    3939</div>
    4040<TMPL_IF addperm>
    41 <div id="newlink"><a href="/ip/cgi-bin/main.cgi?action=assign">Add new assignment</a></div>
     41<div id="newlink"><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign">Add new assignment</a></div>
    4242</TMPL_IF>
    4343</div>
     
    4545<div id="main">
    4646<div id="utils">
    47 <a href="/ip/cgi-bin/main.cgi?action=nodesearch">Find by connection point</a>
     47<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=nodesearch">Find by connection point</a>
    4848</div>
  • branches/htmlform/templates/index.tmpl

    r478 r511  
    1111<TMPL_LOOP NAME=masterlist>
    1212<tr class="row<TMPL_VAR name=rowclass>">
    13 <td><a href="/ip/cgi-bin/main.cgi?action=showmaster&amp;block=<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master></a></td>
     13<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showmaster&amp;block=<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master></a></td>
    1414<td><TMPL_VAR NAME=routed></td>
    1515<td><TMPL_VAR NAME=allocated></td>
     
    2020</table>
    2121<TMPL_IF addmaster>
    22 <a href="/ip/cgi-bin/main.cgi?action=addmaster">Add new master block</a>
     22<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=addmaster">Add new master block</a>
    2323</TMPL_IF>
    2424<br><br>
  • branches/htmlform/templates/listpool.tmpl

    r471 r511  
    2828<TMPL_LOOP name=poolips>
    2929<tr class="row<TMPL_VAR NAME=rowclass>">
    30 <td><a href="/ip/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a></td>
     30<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a></td>
    3131<td><TMPL_VAR NAME=custid></td>
    3232<td><TMPL_VAR NAME=available></td>
    3333<td><TMPL_VAR NAME=desc></td>
    3434<TMPL_IF maydel><td><TMPL_IF delme>
    35 <a href="/ip/cgi-bin/main.cgi?action=delete&amp;block=<TMPL_VAR NAME=ip>&amp;alloctype=<TMPL_VAR NAME=type>">Unassign this IP</a>
     35<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=delete&amp;block=<TMPL_VAR NAME=ip>&amp;alloctype=<TMPL_VAR NAME=type>">Unassign this IP</a>
    3636</TMPL_IF></td></TMPL_IF>
    3737</tr>
  • branches/htmlform/templates/newcity.tmpl

    r459 r511  
    33<head>
    44        <title>IP Database - Add new city</title>
    5         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    6         <link rel="stylesheet" type="text/css" href="/ip/local.css">
    7         <script src="/ip/templates/widgets.js" type="text/javascript"></script>
     5        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/ipdb.css">
     6        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/local.css">
     7        <script src="<TMPL_VAR NAME=webpath>/templates/widgets.js" type="text/javascript"></script>
    88</head>
    99
  • branches/htmlform/templates/newnode.tmpl

    r460 r511  
    33<head>
    44        <title>IP Database - Add new tower/demarc switch</title>
    5         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    6         <link rel="stylesheet" type="text/css" href="/ip/local.css">
    7         <script src="/ip/templates/widgets.js" type="text/javascript"></script>
     5        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/ipdb.css">
     6        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/local.css">
     7        <script src="<TMPL_VAR NAME=webpath>/templates/widgets.js" type="text/javascript"></script>
    88</head>
    99
  • branches/htmlform/templates/nodesearch.tmpl

    r494 r511  
    44<TMPL_ELSE>
    55<div class="heading">Switch/tower search</div>
    6 <form action="/ip/cgi-bin/search.cgi" method=POST>
     6<form action="<TMPL_VAR NAME=webpath>/cgi-bin/search.cgi" method=POST>
    77<fieldset><legend></legend>
    88<table cellspacing="1" cellpadding="2">
  • branches/htmlform/templates/search/compsearch.tmpl

    r482 r511  
    22<div class="heading">Complex Search</div>
    33
    4 <form action="/ip/cgi-bin/search.cgi" method=POST>
     4<form action="<TMPL_VAR NAME=webpath>/cgi-bin/search.cgi" method=POST>
    55<fieldset><legend></legend>
    66<input type="hidden" name="stype" value="c">
  • branches/htmlform/templates/search/sresults.tmpl

    r500 r511  
    1717<TMPL_LOOP NAME=sresults>
    1818<tr class="row<TMPL_VAR NAME=rowclass>">
    19 <td><TMPL_IF issub>Sub </TMPL_IF><a href="/ip/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a><TMPL_IF ispool>&nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=block>">List IPs</a></TMPL_IF></td>
     19<td><TMPL_IF issub>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a><TMPL_IF ispool>&nbsp; <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=block>">List IPs</a></TMPL_IF></td>
    2020<td><TMPL_VAR NAME=custid></td>
    2121<td><TMPL_VAR NAME=disptype></td>
     
    3131<TMPL_IF multipage>
    3232<div class="center">Page:
    33 <TMPL_LOOP NAME=pgnums><TMPL_IF thispage><b><TMPL_VAR NAME=pgnum>&nbsp;</b><TMPL_ELSE><a href="/ip/cgi-bin/search.cgi?page=<TMPL_VAR NAME=pgnum>&amp;stype=<TMPL_VAR NAME=stype>&amp;<TMPL_VAR NAME=extraopts>"><TMPL_VAR NAME=pgnum></a>&nbsp;</TMPL_IF>
     33<TMPL_LOOP NAME=pgnums><TMPL_IF thispage><b><TMPL_VAR NAME=pgnum>&nbsp;</b><TMPL_ELSE><a href="<TMPL_VAR NAME=webpath>/cgi-bin/search.cgi?page=<TMPL_VAR NAME=pgnum>&amp;stype=<TMPL_VAR NAME=stype>&amp;<TMPL_VAR NAME=extraopts>"><TMPL_VAR NAME=pgnum></a>&nbsp;</TMPL_IF>
    3434</TMPL_LOOP>
    3535</div>
  • branches/htmlform/templates/showmaster.tmpl

    r474 r511  
    1414<TMPL_LOOP NAME=routedlist>
    1515<tr class="row<TMPL_VAR NAME=rowclass>">
    16 <td><a href="/ip/cgi-bin/main.cgi?action=showrouted&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a></td>
     16<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showrouted&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a></td>
    1717<td><TMPL_VAR NAME=city></td>
    1818<td><TMPL_VAR NAME=nsubs></td>
     
    2727<TMPL_IF delmaster>
    2828<br>
    29 <form action="/ip/cgi-bin/main.cgi" method=POST>
     29<form action="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi" method=POST>
    3030<fieldset><legend></legend>
    3131<input type=hidden name=action value="delete">
  • branches/htmlform/templates/showrouted.tmpl

    r474 r511  
    1717<tr class="row<TMPL_VAR NAME=rowclass>">
    1818<td>
    19 <TMPL_IF subblock>Sub </TMPL_IF><a href="/ip/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a>
    20 <TMPL_IF listpool> &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=block>">List IPs</a></TMPL_IF>
     19<TMPL_IF subblock>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a>
     20<TMPL_IF listpool> &nbsp; <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=block>">List IPs</a></TMPL_IF>
    2121</td>
    2222<td><TMPL_VAR NAME=city></td>
     
    3333<TMPL_IF delrouted>
    3434<br>
    35 <form action="/ip/cgi-bin/main.cgi" method=POST>
     35<form action="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi" method=POST>
    3636<fieldset><legend></legend>
    3737<input type=hidden name=action value="delete">
     
    5959<TMPL_LOOP name=unassigned>
    6060<tr class="row<TMPL_VAR NAME=rowclass>">
    61 <td><TMPL_IF subblock>Sub </TMPL_IF><a href="/ip/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=fblock>&amp;fbtype=<TMPL_VAR NAME=fbtype>"><TMPL_VAR NAME=fblock></a></td>
     61<td><TMPL_IF subblock>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=fblock>&amp;fbtype=<TMPL_VAR NAME=fbtype>"><TMPL_VAR NAME=fblock></a></td>
    6262<td><TMPL_VAR NAME=frange></td>
    6363</tr>
  • branches/htmlform/templates/subnet-calc.tmpl

    r499 r511  
    33<head>
    44        <title>IP Database - Subnet Calculator</title>
    5         <link rel="stylesheet" type="text/css" href="/ip/ipdb.css">
    6         <link rel="stylesheet" type="text/css" href="/ip/local.css">
     5        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/ipdb.css">
     6        <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=webpath>/local.css">
    77
    88</head>
  • branches/htmlform/templates/update.tmpl

    r505 r511  
    6565<br>
    6666<div class="backlink">
    67 <a href="/ip/cgi-bin/main.cgi?action=<TMPL_IF backpool>listpool&amp;pool=<TMPL_ELSE>showrouted&amp;block=</TMPL_IF><TMPL_VAR NAME=backblock>">Back to <TMPL_VAR NAME=backblock></a>
     67<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=<TMPL_IF backpool>listpool&amp;pool=<TMPL_ELSE>showrouted&amp;block=</TMPL_IF><TMPL_VAR NAME=backblock>">Back to <TMPL_VAR NAME=backblock></a>
    6868</div>
    6969</TMPL_IF>
  • branches/htmlform/templates/widgets.js

    r459 r511  
     1function webPath() {
     2        var mypath = "";
     3        var pathbits = window.location.pathname.split( '/' );
     4        for ( i = 0; i <= pathbits.length-2; i++ ) {
     5                mypath += pathbits[i];
     6                mypath += "/";
     7        }
     8        return mypath;
     9}
     10
    111function openHelp() {
    2         window.open("/ip/help.html", "help_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=700,height=400")
     12        window.open(webPath() + "help.html", "help_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=700,height=400")
    313}
    414function openTables() {
    5         window.open("/ip/tables.html", "subnet_tables", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=600,height=250") 
     15        window.open(webPath() + "tables.html", "subnet_tables", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=600,height=250") 
    616}
    717function helpAllocTypes() {
    8         window.open("/ip/alloctypes.html", "alloc_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=750,height=550")
     18        window.open(webPath() + "alloctypes.html", "alloc_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=750,height=550")
    919}
    1020function popNotes(page) {
Note: See TracChangeset for help on using the changeset viewer.