diff options
| -rw-r--r-- | dhcp-createnet-html.lsp | 69 | ||||
| -rw-r--r-- | dhcp-editnet-html.lsp | 86 | ||||
| -rw-r--r-- | dhcp-editspc-html.lsp | 23 | ||||
| -rw-r--r-- | dhcp-home-html.lsp | 116 | ||||
| -rw-r--r-- | dhcp-settings-html.lsp | 26 | ||||
| -rw-r--r-- | dhcp-view-html.lsp | 10 |
6 files changed, 187 insertions, 143 deletions
diff --git a/dhcp-createnet-html.lsp b/dhcp-createnet-html.lsp index fd80622..be22e05 100644 --- a/dhcp-createnet-html.lsp +++ b/dhcp-createnet-html.lsp @@ -8,26 +8,51 @@ <? if #form.errcode.msg > 0 then - io.write("<pre style=\"color: #ff2020\">" .. form.errcode.msg .. "</pre><br>") + io.write("<p class='error'>" .. form.errcode.msg .. "</p>") end ?> <form action="<? io.write(option.script .. option.prefix .. option.controller .. "/" .. option.action .. option.extra) ?>" method="POST"> -<table> - <tr><td><nobr>Name:</nobr></td><td><input type="text" name="name" value="<? io.write(net.name.value) ?>"></td></tr> - <tr><td><nobr>Subnet:</nobr></td><td><input type="text" name="subnet" value="<? io.write(net.subnet.value) ?>"></td></tr> - <tr><td><nobr>Netmask:</nobr></td><td><input type="text" name="netmask" value="<? io.write(net.netmask.value) ?>"></td></tr> - <tr><td><nobr>Gateway:</nobr></td><td><input type="text" name="gateway" value="<? io.write(net.gateway.value) ?>"></td></tr> - <tr><td><nobr>DNS Server 1:</nobr></td><td><input type="text" name="dnssrv1" value="<? io.write(net.dnssrv1.value) ?>"></td></tr> - <tr><td><nobr>DNS Server 2:</nobr></td><td><input type="text" name="dnssrv2" value="<? io.write(net.dnssrv2.value) ?>"></td></tr> - <tr><td><nobr>Default Lease Time:</nobr></td><td><input type="text" name="defleasetime" value="<? io.write(net.defleasetime.value) ?>"></td></tr> - <tr><td><nobr>Maximum Lease Time:</nobr></td><td><input type="text" name="maxleasetime" value="<? io.write(net.maxleasetime.value) ?>"></td></tr> - <tr><td><nobr>Domain Name:</nobr></td><td><input type="text" name="domainname" value="<? io.write(net.domainname.value) ?>"></td></tr> - <tr><td><nobr>WPAD:</nobr></td><td><input type="text" name="wpad" value="<? io.write(net.wpad.value) ?>"></td></tr> - <tr><td><nobr>Lease Range Start:</nobr></td><td><input type="text" name="leaserangestart" value="<? io.write(net.leaserangestart.value) ?>"></td></tr> - <tr><td><nobr>Lease Range End:</nobr></td><td><input type="text" name="leaserangeend" value="<? io.write(net.leaserangeend.value) ?>"></td></tr> - <tr><td><nobr>Unknown Clients</nobr></td><td><select name="unknownclients" size="1"> + +<dt>Name</dt> +<dd><input type="text" class="text" name="name" value="<? io.write(net.name.value) ?>"></dd> + +<dt>Subnet</dt> +<dd><input type="text" class="text" name="subnet" value="<? io.write(net.subnet.value) ?>"></dd> + +<dt>Netmask</dt> +<dd><input type="text" class="text" name="netmask" value="<? io.write(net.netmask.value) ?>"></dd> + +<dt>Gateway</dt> +<dd><input type="text" class="text" name="gateway" value="<? io.write(net.gateway.value) ?>"></dd> + +<dt>DNS Server 1</dt> +<dd><input type="text" class="text" name="dnssrv1" value="<? io.write(net.dnssrv1.value) ?>"></dd> + +<dt>DNS Server 2</dt> +<dd><input type="text" class="text" name="dnssrv2" value="<? io.write(net.dnssrv2.value) ?>"></dd> + +<dt>Default Lease Time</dt> +<dd><input type="text" class="text" name="defleasetime" value="<? io.write(net.defleasetime.value) ?>"></dd> + +<dt>Maximum Lease Time</dt> +<dd><input type="text" class="text" name="maxleasetime" value="<? io.write(net.maxleasetime.value) ?>"></dd> + +<dt>Domain Name</dt> +<dd><input type="text" class="text" name="domainname" value="<? io.write(net.domainname.value) ?>"></dd> + +<dt>WPAD</dt> +<dd><input type="text" class="text" name="wpad" value="<? io.write(net.wpad.value) ?>"></dd> + +<dt>Lease Range Start</dt> +<dd><input type="text" class="text" name="leaserangestart" value="<? io.write(net.leaserangestart.value) ?>"></dd> + +<dt>Lease Range End</dt> +<dd><input type="text" class="text" name="leaserangeend" value="<? io.write(net.leaserangeend.value) ?>"></dd> + +<dt>Unknown Clients</dt> +<dd><select name="unknownclients" size="1"> <? if net.unknownclients.value == "allow" then io.write(" <option selected>allow</option>\n"); @@ -37,6 +62,14 @@ io.write(" <option selected>deny</option>\n"); end ?> - </select></td></tr> - <tr><td></td><td><input type=submit name=cmd value="create" style="width:100px"></form><form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?> method="POST"> -<input type=submit name="cmd" value="back" style="width:100px"></form></td></tr></table> +</select></dd> + +<dt>Submit above settings</dt> +<dd><input type=submit name=cmd value="create" class="submit"></dd> + +</form> + +<dt>Cancel and go back</dt> +<dd><form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?> method="POST"> +<input type=submit name="cmd" value="back" class="submit"></form></dd> + diff --git a/dhcp-editnet-html.lsp b/dhcp-editnet-html.lsp index 2287bcb..d5cf0cf 100644 --- a/dhcp-editnet-html.lsp +++ b/dhcp-editnet-html.lsp @@ -20,7 +20,7 @@ <? if #errcode.msg > 0 then - io.write("<pre style=\"color: #ff2020\">" .. errcode.msg .. "</pre><br>") + io.write("<p class='error'>" .. errcode.msg .. "</p>") end ?> @@ -28,19 +28,45 @@ option.controller .. "/" .. option.action .. option.extra) ?>" method="POST"> <input type="hidden" name="name" value="<? io.write(net.name.value) ?>"> <input type="hidden" name="dynhost1" value=""> -<table> - <tr><td><nobr>Subnet:</nobr></td><td><input type="text" name="subnet" value="<? io.write(net.subnet.value) ?>"></td></tr> - <tr><td><nobr>Netmask:</nobr></td><td><input type="text" name="netmask" value="<? io.write(net.netmask.value) ?>"></td></tr> - <tr><td><nobr>Gateway:</nobr></td><td><input type="text" name="gateway" value="<? io.write(net.gateway.value) ?>"></td></tr> - <tr><td><nobr>DNS Server 1:</nobr></td><td><input type="text" name="dnssrv1" value="<? io.write(net.dnssrv1.value) ?>"></td></tr> - <tr><td><nobr>DNS Server 2:</nobr></td><td><input type="text" name="dnssrv2" value="<? io.write(net.dnssrv2.value) ?>"></td></tr> - <tr><td><nobr>Default Lease Time:</nobr></td><td><input type="text" name="defleasetime" value="<? io.write(net.defleasetime.value) ?>"></td></tr> - <tr><td><nobr>Maximum Lease Time:</nobr></td><td><input type="text" name="maxleasetime" value="<? io.write(net.maxleasetime.value) ?>"></td></tr> - <tr><td><nobr>Domain Name:</nobr></td><td><input type="text" name="domainname" value="<? io.write(net.domainname.value) ?>"></td></tr> - <tr><td><nobr>WPAD:</nobr></td><td><input type="text" name="wpad" value="<? io.write(net.wpad.value) ?>"></td></tr> - <tr><td><nobr>Lease Range Start:</nobr></td><td><input type="text" name="leaserangestart" value="<? io.write(net.leaserangestart.value) ?>"></td></tr> - <tr><td><nobr>Lease Range End:</nobr></td><td><input type="text" name="leaserangeend" value="<? io.write(net.leaserangeend.value) ?>"></td></tr> - <tr><td><nobr>Unknown Clients</nobr></td><td><select name="unknownclients" size="1" onChange="javascript:handleDynChg();"> + +<dt>Name</dt> +<dd><? io.write(net.name.value) ?></dd> + +<dt>Subnet</dt> +<dd><input type="text" class="text" name="subnet" value="<? io.write(net.subnet.value) ?>"></dd> + +<dt>Netmask</dt> +<dd><input type="text" class="text" name="netmask" value="<? io.write(net.netmask.value) ?>"></dd> + +<dt>Gateway</dt> +<dd><input type="text" class="text" name="gateway" value="<? io.write(net.gateway.value) ?>"></dd> + +<dt>DNS Server 1</dt> +<dd><input type="text" class="text" name="dnssrv1" value="<? io.write(net.dnssrv1.value) ?>"></dd> + +<dt>DNS Server 2</dt> +<dd><input type="text" class="text" name="dnssrv2" value="<? io.write(net.dnssrv2.value) ?>"></dd> + +<dt>Default Lease Time</dt> +<dd><input type="text" class="text" name="defleasetime" value="<? io.write(net.defleasetime.value) ?>"></dd> + +<dt>Maximum Lease Time</dt> +<dd><input type="text" class="text" name="maxleasetime" value="<? io.write(net.maxleasetime.value) ?>"></dd> + +<dt>Domain Name</dt> +<dd><input type="text" class="text" name="domainname" value="<? io.write(net.domainname.value) ?>"></dd> + +<dt>WPAD</dt> +<dd><input type="text" class="text" name="wpad" value="<? io.write(net.wpad.value) ?>"></dd> + +<dt>Lease Range Start</dt> +<dd><input type="text" class="text" name="leaserangestart" value="<? io.write(net.leaserangestart.value) ?>"></dd> + +<dt>Lease Range End</dt> +<dd><input type="text" class="text" name="leaserangeend" value="<? io.write(net.leaserangeend.value) ?>"></dd> + +<dt>Unknown Clients</dt> +<dd><select name="unknownclients" size="1" onChange="javascript:handleDynChg();"> <? if net.unknownclients.value == "allow" then io.write(" <option selected>allow</option>\n"); @@ -50,34 +76,8 @@ io.write(" <option selected>deny</option>\n"); end ?> - </select></td></tr> - <form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?>" method="POST"> -</td></tr></table> - -<br><br> -<h2>Subnet: Static Hosts</h2> -Enter one host per line in the format: <i>hostname;ip;mac;comment</i><br> -<table> -<tr><td>Hostname</td><td>[a-z], [0-9], -</td></tr> -<tr><td>IP</td><td>xxx.xxx.xxx.xxx</td></tr> -<tr><td>MAC</td><td>XX:XX:XX:XX:XX:XX</td></tr> -</table> -<table> -<tr><td><textarea name="statichosts" style="width:600px;"><? io.write( net.statichosts.value ) ?></textarea></td></tr> -</table><br> - -<input type="hidden" name="advancedx" value="<? io.write(net.advanced.value) ?>"> -<h2>Subnet: Advanced Configuration</h2> -<input type="checkbox" name="useadvanced" value="use" onChange="javascript:handleAdvChg();"> <i>Activate Advanced Configuration - use with caution!</i><br><br> -<table> -<tr><td> -<div id="advanced"></div></td></tr> -<tr><td><input type=submit name="cmd" value="update" style="width:100px"></form> -<form action="<? io.write(option.script .. option.prefix .. option.controller .. "/delnet") ?>" method="POST"> - <input type=submit name="cmd" value="delete" style="width:100px"> - <input type=hidden name="network" value="<? io.write( net.name.value ) ?>"> -</form><form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?>" method="POST"> - <input type=submit name="cmd" value="back" style="width:100px"></form></td></tr> -</table> +</select></dd> </form> +<form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?>" method="POST"> + diff --git a/dhcp-editspc-html.lsp b/dhcp-editspc-html.lsp index 922fe24..a8197d7 100644 --- a/dhcp-editspc-html.lsp +++ b/dhcp-editspc-html.lsp @@ -11,18 +11,25 @@ <pre style="color: #ff2020;"><? io.write( form.errcode.msg ) ?></pre> <h2>DHCPd - Dynamic Hosts</h2> -<table><tr><td><textarea name="dynamic" style="width:600px"><? io.write( form.value.dynamic ) ?></textarea></td></tr></table> +<textarea name="dynamic"><? io.write( form.value.dynamic ) ?></textarea> <h2>DHCPd - Pre Main Configuration</h2> These fields below are copied into the final dhcpd.conf on configuration generation without any validation check. Do not use them unless you know what you are doing. -<table><tr><td><textarea name="preconfig" style="width:600px"><? io.write(form.value.preconfig) ?></textarea></td></tr></table> +<textarea name="preconfig"><? io.write(form.value.preconfig) ?></textarea> <h2>DHCPd - Post Main Configuration</h2> -<table> -<tr><td><textarea name="postconfig" style="width:600px"><? io.write(form.value.postconfig) ?></textarea></td></tr> -<tr><td><input type="submit" name="cmd" value="update" style="width:100px"></form> -<form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?>" method="POST"> -<input type="submit" name="cmd" value="back" style="width:100px"> -</form></td></tr></table> +<textarea name="postconfig"><? io.write(form.value.postconfig) ?></textarea> + +<h2>Submit/Cancel</h2> + +<dt>Submit above settings</dt> +<dd><input type="submit" name="cmd" value="update" class="submit"></dd> + +</form> + +<dt>Cancel and go back</dt> +<dd><form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?>" method="POST"> +<input type=submit name="cmd" value="back" class="submit"></form></dd> + diff --git a/dhcp-home-html.lsp b/dhcp-home-html.lsp index c4ad154..da6d8d5 100644 --- a/dhcp-home-html.lsp +++ b/dhcp-home-html.lsp @@ -2,75 +2,73 @@ local form = ... local data = form.option ?> + <h1>Home</h1> -<h2>DHCPd - Status</h2> -<? io.write(form.info.version.value) ?> is: <b><? io.write( form.info.status.value ) ?></b><br><br> - -<h2>DHCPd - Daemon Control</h2> -<table> -<form action="" method="POST"> -<tr> -<td><input type=submit name="srvcmd" value="start" style="width:100px"></td> -<td><input type=submit name="srvcmd" value="stop" style="width:100px"></td> -<td><input type=submit name="srvcmd" value="restart" style="width:100px"></td> -</tr> -</form> -</table> -<pre style="color: #ff2020"><? io.write( form.info.srvctrl.value ) ?></pre><br> +<h2>System info</h2> -<h2>DHCPd - Generate Configuration File</h2> -<table> -<form action="<? io.write(data.script .. data.prefix .. data.controller .. "/home") ?>" method="POST"> -<tr><td><input type=submit name="cmd" value="generate" style="width:100px"></td></tr> -</form> -</table> -<? if form.genmsg ~= nil then io.write( "<pre style=\"color: #ff2020\">" .. form.genmsg .. "</pre>" ) end ?><br> +<dt>Program version</dt> +<dd><? io.write(form.info.version.value) ?></dd> -<h2>DHCPd - Global Settings</h2> -<table> -<form action="<? io.write(data.script .. data.prefix .. data.controller .. "/settings") ?>" method="POST"> -<tr><td><input type=submit name="cmd" value="edit" style="width:100px"></td></tr> -</form> -</table><br> - -<h2>DHCPd - Edit Subnet</h2> -<table> -<form action="<? io.write(data.script .. data.prefix .. data.controller .. "/editnet") ?>" method="POST"> -<tr><td>Network to modify<td> -<td><select name="network" size="1"> - <option value="choose">-- Choose Network --</option> +<dt>Process status</dt> +<dd><? io.write( form.info.status.value ) ?></dd> + +<dt>Daemon control</dt> +<dd><form action="" method="POST"> +<input type=submit name="srvcmd" value="start" class="submit"> +<input type=submit name="srvcmd" value="stop" class="submit"> +<input type=submit name="srvcmd" value="restart" class="submit"></form> +<p class='error'><? io.write( form.info.srvctrl.value ) ?></p> +</dd> + +<H2>Change/Generate settings</H2> + +<H3>Global</H3> + +<dt>Edit global settings</dt> +<dd><form action="<? io.write(data.script .. data.prefix .. data.controller .. "/settings") ?>" method="POST"> +<input type=submit name="cmd" value="edit" class="submit"> +</form></dd> + + +<dt>Global Config Pre/Post Code</dt> +<dd><form action="<? io.write(data.script .. data.prefix .. data.controller .. "/editspc") ?>" method="POST"> +<input type=submit name="cmd" value="edit" class="submit"> +</form></dd> + +<H3>Subnet declarations</H3> + +<dt>Edit subnet</dt> +<dd><form action="<? io.write(data.script .. data.prefix .. data.controller .. "/editnet") ?>" method="POST"> +<select name="network" size="1"> + <option value="choose">-- Choose Network --</option> <? for k,v in ipairs(form.info.subnets) do io.write("<option>" .. v .. "</option>") end ?> -</select></td> -<td><input type=submit name="cmd" value="edit" style="width:100px"></td> -</form> -</table><br> - -<h2>DHCPd - Add New Subnet</h2> -<table> -<form action="<? io.write(data.script .. data.prefix .. data.controller .. "/createnet") ?>" method="POST"> -<tr> - <td><input type=submit name="cmd" value="new" style="width:100px"></td> -</tr> -</form> -</table> -<br> +</select><input type=submit name="cmd" value="edit" class="submit"> +</form></dd> -<h2>DHCPd - Global Config Pre/Post Code</h2> -<table> -<form action="<? io.write(data.script .. data.prefix .. data.controller .. "/editspc") ?>" method="POST"> -<tr><td><input type=submit name="cmd" value="edit" style="width:100px"></td></tr> -</form> -</table><br> +<dt>Add new subnet</dt> +<dd><form action="<? io.write(data.script .. data.prefix .. data.controller .. "/createnet") ?>" method="POST"> +<input type=submit name="cmd" value="new" class="submit"> +</form></dd> + +<h3>Generate config</h3> + +<dt>Generate Configuration File</dt> +<dd><form action="<? io.write(data.script .. data.prefix .. data.controller .. "/home") ?>" method="POST"> +<input type=submit name="cmd" value="generate" class="submit"></form> +<? if form.genmsg ~= nil then io.write( "<p class='error'>" .. form.genmsg .. "</p>" ) end ?></dd> + +<h2>View files</h2> -<h2>DHCPd - View Files</h2> -<table> <form action="<? io.write(data.script .. data.prefix .. data.controller .. "/view") ?>" method="POST"> -<tr><td><input type=submit name="conf" value="dhcpd.conf" style="width:200px"></td></tr> -<tr><td><input type=submit name="leases" value="dhcpd.leases" style="width:200px"></td></tr> +<dt>View dhcpd.conf</dt> +<dd><input type=submit name="conf" value="dhcpd.conf" class="submit"></dd> + +<dt>View dhcpd.leases</dt> +<dd><input type=submit name="leases" value="dhcpd.leases" class="submit"></dd> </form> -</table><br> + diff --git a/dhcp-settings-html.lsp b/dhcp-settings-html.lsp index 73b377d..f8eb173 100644 --- a/dhcp-settings-html.lsp +++ b/dhcp-settings-html.lsp @@ -14,11 +14,23 @@ <form action="<? io.write(option.script .. option.prefix .. option.controller .. "/" .. option.action .. option.extra) ?>" method="POST"> -<table> - <tr><td><nobr>Default Lease Time:</nobr></td><td><input type="text" name="defleasetime" value="<? io.write(settings.defleasetime.value) ?>"></td></tr> - <tr><td><nobr>Maximum Lease Time:</nobr></td><td><input type="text" name="maxleasetime" value="<? io.write(settings.maxleasetime.value) ?>"></td></tr> - <tr><td><nobr>Domain Name:</nobr></td><td><input type="text" name="domainname" value="<? io.write(settings.domainname.value) ?>"></td></tr> - <tr><td></td><td><input type=submit name=cmd value="update" style="width:100px"></form><form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?> method="POST"> -<input type=submit name="cmd" value="back" style="width:100px"></form></td></tr> -</table> + +<dt>Default Lease Time</dt> +<dd><input type="text" name="defleasetime" class="text" value="<? io.write(settings.defleasetime.value) ?>"></dd> + +<dt>Maximum Lease Time</dt> +<dd><input type="text" name="maxleasetime" class="text" value="<? io.write(settings.maxleasetime.value) ?>"></dd> + +<dt>Domain Name</dt> +<dd><input type="text" name="domainname" class="text" value="<? io.write(settings.domainname.value) ?>"></dd> + +<dt>Submit above settings</dt> +<dd><input type=submit name=cmd value="update" class="submit"></dd> + +</form> + +<dt>Cancel and go back</dt> +<dd><form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?> method="POST"> +<input type=submit name="cmd" value="back" class="submit"></form></dd> + diff --git a/dhcp-view-html.lsp b/dhcp-view-html.lsp index bc188c1..9cf116e 100644 --- a/dhcp-view-html.lsp +++ b/dhcp-view-html.lsp @@ -5,14 +5,8 @@ ?> <h1>View <? io.write(value.filename.value) ?></h1> -<table> -<tr><td> -<textarea name="" style="width:600px"><? io.write(value.contents.value) ?></textarea> -</td></tr> -<tr><td> +<textarea name=""><? io.write(value.contents.value) ?></textarea> <form action="<? io.write(option.script .. option.prefix .. option.controller .. "/home") ?>" method="POST"> - <input type=submit name="cmd" value="Back" style="width:600px"> + <input type=submit name="cmd" value="Back" class="submit"> </form> -</td></tr> -</table> |