Changeset 457 for branches

Timestamp:

08/03/10 18:02:29 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Finally got "assign IPs" template page to validate in all 3
current possible modes (normal, freeblock, contained freeblock).
See #3.

File:

• branches/htmlform/templates/assign.tmpl (modified) (6 diffs)

branches/htmlform/templates/assign.tmpl

@@ -9 +9 @@
 <br>
 
+<form method="post" action="main.cgi" class="regular">
+<fieldset><legend></legend>
+
+<TMPL_IF NAME=block>
+<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
+<input type="hidden" name="fbassign" value="y">
+</TMPL_IF>
+
 <table class="regular" cellspacing="1" cellpadding="1">
-<form method="POST" action="main.cgi" class="regular">
 
 <tr class="row0">
-<td>Customer location:&nbsp;</td>
+<td>Customer location:</td>
 <td>
-<select name="city"><option selected>-</option>
-<TMPL_LOOP NAME=citylist><option><TMPL_VAR NAME=city></option></TMPL_LOOP>
+<select name="city">
+        <option selected="selected">-</option>
+<TMPL_LOOP NAME=citylist>
+        <option><TMPL_VAR NAME=city></option></TMPL_LOOP>
 </select>
 &nbsp;<a href="javascript:popNotes('/ip/newcity.html')">Add new location</a>
@@ -37 +46 @@
 </tr>
 
-<TMPL_IF NAME=block>
-<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
-<input type="hidden" name="fbassign" value="y">
-<TMPL_ELSE>
+<TMPL_UNLESS NAME=block>
 <tr class="row0">
-<td>Subnet CIDR mask length:&nbsp;</td>
-<td valign=top>&nbsp;/&nbsp;<input type="text" name="maskbits" size="3" maxlength="3"></td>
+<td>Subnet CIDR mask length:</td>
+<td valign="top">&nbsp;/&nbsp;<input type="text" name="maskbits" size="3" maxlength="3"></td>
 </tr>
-</TMPL_IF>
+</TMPL_UNLESS>
 
 <tr class="<TMPL_VAR NAME=rowa>">
-<td>Customer ID:&nbsp;</td>
+<td>Customer ID:</td>
 <td><input type="text" name="custid" size="15" maxlength="15"> (Only required for Customer allocations)</td>
 </tr>
@@ -56 +62 @@
 <td>
 <select name="node">
-        <option selected>-</option>
+        <option selected="selected">-</option>
 <TMPL_LOOP NAME=nodelist>
         <option value="<TMPL_VAR NAME=nid>"><TMPL_VAR NAME=nname></option></TMPL_LOOP>
@@ -66 +72 @@
 <TMPL_UNLESS NAME=block>
 <tr class="<TMPL_VAR NAME=rowa>">
-<td>Route from/through:&nbsp;</td>
+<td>Route from/through:</td>
 <td>
 <select name="pop">
-        <option selected value=>-</option>
+        <option selected value="">-</option>
 <TMPL_LOOP NAME=pops>
         <option><TMPL_VAR NAME=pop></option></TMPL_LOOP>
@@ -79 +85 @@
 <td>Route/allocate from this master:&nbsp;</td>
 <td>
-<select name=allocfrom>
-        <option selected>-</option>
+<select name="allocfrom">
+        <option selected="selected">-</option>
 <TMPL_LOOP NAME=masterlist>
         <option><TMPL_VAR NAME=master></option></TMPL_LOOP>
 </select>
-Allow automatic allocation from private IP ranges:<input type=checkbox name=allowpriv></td>
+Allow automatic allocation from private IP ranges:<input type="checkbox" name="allowpriv"></td>
 </tr>
 </TMPL_UNLESS>
 
 <tr class="<TMPL_VAR NAME=rowa>">
-<td>Circuit ID:&nbsp;</td>
-<td><input name=circid size=40></td>
+<td>Circuit ID:</td>
+<td><input name="circid" size="40"></td>
 </tr>
 
 <tr class="<TMPL_VAR NAME=rowb>">
-<td>Description/Name:&nbsp;</td>
-<td><input name="desc" size=40></td>
+<td>Description/Name:</td>
+<td><input name="desc" size="40"></td>
 </tr>
 
@@ -112 +118 @@
 <tr class="<TMPL_IF NAME=privdata><TMPL_VAR NAME=rowa><TMPL_ELSE><TMPL_VAR NAME=rowb></TMPL_IF>">
 <td class="center" colspan="2"><input type="submit" value="  Assign  "></td>
-<input type="hidden" name="action" value="confirm">
 </tr>
 
-</form>
 </table>
 
+<input type="hidden" name="action" value="confirm">
+</fieldset>
+</form>
+
 </div>