Changeset 575 for trunk/templates/assign.tmpl

Timestamp:

12/21/12 17:43:19 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update "add new allocation" templates and calling code for new
table logic and fields.
Also update listpool page to pass around rdepth as necessary

File:

• trunk/templates/assign.tmpl (modified) (5 diffs)

trunk/templates/assign.tmpl

@@ -1 +1 @@
 <div class="indent">
-<TMPL_IF block>
-<div class="tblsubtitle">
-Assign free <TMPL_IF iscontained><TMPL_VAR NAME=fbdisptype></TMPL_IF> block <TMPL_VAR NAME=block>
-</div>
-<TMPL_ELSE>
-<div class="tblsubtitle">Assign IPs</div>
-</TMPL_IF>
+<div class="tblsubtitle">Assign IP<TMPL_UNLESS fbip>s</TMPL_UNLESS></div>
 <br>
 
@@ -12 +6 @@
 <fieldset><legend class="noshow">&nbsp;</legend>
 
-<TMPL_IF block>
-<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
+<table class="regular" cellspacing="1" cellpadding="1">
+
+<TMPL_IF allocfrom>
+<tr class="row0">
+<TMPL_IF fbip>
+<td>IP pool:</td>
+<TMPL_ELSE>
+<td>Free block selected:</td>
+</TMPL_IF>
+<td><TMPL_VAR NAME=allocfrom><input type="hidden" name="allocfrom" value="<TMPL_VAR NAME=allocfrom>">
+<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
+</td>
+</tr>
+<tr class="row1">
+<TMPL_IF fbip>
+<td>IP:</td>
+<td>
+<TMPL_VAR NAME=block><input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
 <input type="hidden" name="fbassign" value="y">
+</td>
+<TMPL_ELSE>
+<td>Allocation:</td>
+<td>
+<input name="block" value="<TMPL_VAR NAME=block>">
+<input type="hidden" name="fbassign" value="y">
+</td>
 </TMPL_IF>
-
-<table class="regular" cellspacing="1" cellpadding="1">
+</tr>
+</TMPL_IF>
 
 <tr class="row0">
@@ -34 +51 @@
 <td>Allocation type:</td>
 <td>
-<TMPL_IF iscontained>
+<TMPL_IF fbip>
 <TMPL_VAR NAME=fbdisptype><input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
 <TMPL_ELSE>
@@ -46 +63 @@
 </tr>
 
-<TMPL_UNLESS block>
+<TMPL_UNLESS allocfrom>
 <tr class="row0">
 <td>Subnet CIDR mask length:</td>
@@ -66 +83 @@
         <option value="<TMPL_VAR NAME=node_id>"><TMPL_VAR NAME=node_name></option></TMPL_LOOP>
 </select>
-&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new location</a>
+&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new demarc/tower</a>
 </td>
 </tr>
 
-<TMPL_UNLESS block>
+<TMPL_UNLESS allocfrom>
 <tr class="<TMPL_VAR NAME=rowa>">
 <td>Route from/through:</td>