Changeset 595 for branches/stable/templates/assign.tmpl

Timestamp:

05/15/13 17:26:55 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Hand-backport pieces of the allocate-from-routed-freeblock from /trunk
post-r553. Cherrypick merge not possible due to intermingled changes
relating to the database structure updates.
Includes a handful of harmless references to the new structure.
Will likely cause merge conflicts when the structure update is merged.

File:

• branches/stable/templates/assign.tmpl (modified) (7 diffs)

branches/stable/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="parent" value="<TMPL_VAR NAME=parent>">
+<input type="hidden" name="fbid" value="<TMPL_VAR NAME=fbid>">
+</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 +52 @@
 <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>
+<TMPL_IF fbrouted>
 <TMPL_VAR NAME=fbdisptype><input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
 <TMPL_ELSE>
@@ -43 +64 @@
 <input type="button" value=" ? " onclick="helpAllocTypes()" class="regular">
 </TMPL_IF>
+</TMPL_IF>
 </td>
 </tr>
 
-<TMPL_UNLESS block>
+<TMPL_UNLESS allocfrom>
 <tr class="row0">
 <td>Subnet CIDR mask length:</td>
@@ -59 +81 @@
 
 <tr class="<TMPL_VAR NAME=rowb>">
-<td>Wifi tower/Fibre demarc</td>
+<td>Layer-2/demarc node</td>
 <td>
 <select name="node">
@@ -66 +88 @@
         <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 node</a>
 </td>
 </tr>
 
-<TMPL_UNLESS block>
+<TMPL_UNLESS allocfrom>
 <tr class="<TMPL_VAR NAME=rowa>">
-<td>Route from/through:</td>
+<td>Limit to blocks in this location:</td>
 <td>
 <select name="pop">
@@ -83 +105 @@
 
 <tr class="<TMPL_VAR NAME=rowb>">
-<td>Route/allocate from this master:&nbsp;</td>
+<td>Limit to blocks in this master:&nbsp;</td>
 <td>
 <select name="allocfrom">
         <option selected="selected">-</option>
 <TMPL_LOOP NAME=masterlist>
-        <option><TMPL_VAR NAME=master></option></TMPL_LOOP>
+        <option value=<TMPL_VAR NAME=id>><TMPL_VAR NAME=master> (<TMPL_VAR NAME=vrf>)</option></TMPL_LOOP>
 </select>
 Allow automatic allocation from private IP ranges:<input type="checkbox" name="allowpriv"></td>