Changeset 633 for trunk/templates

Timestamp:

10/08/14 18:01:55 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 7/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Netblock assignment
  • Update several supporting data-grabber subs in IPDB.pm
  • Update assignment sub
  • Update data-entry, confirmation, and acceptance/error page templates and related main.cgi sections

Location:

trunk/templates

Files:

• assign.tmpl (modified) (5 diffs)
• confirm.tmpl (modified) (2 diffs)
• insert.tmpl (modified) (2 diffs)

trunk/templates/assign.tmpl

@@ -16 +16 @@
 </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>">
+<input type="hidden" name="parent" value="<TMPL_VAR NAME=parent>">
+<input type="hidden" name="fbid" value="<TMPL_VAR NAME=fbid>">
 </td>
 </tr>
@@ -81 +82 @@
 
 <tr class="<TMPL_VAR NAME=rowa>">
-<td>Wifi tower/Fibre demarc</td>
+<td>Layer-2/demarc node</td>
 <td>
 <select name="node">
@@ -88 +89 @@
         <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 demarc/tower</a>
+&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new demarc node</a>
 </td>
 </tr>
@@ -94 +95 @@
 <TMPL_UNLESS allocfrom>
 <tr class="<TMPL_VAR NAME=rowb>">
-<td>Route from/through:</td>
+<td>Limit to blocks in this location:</td>
 <td>
 <select name="pop">
@@ -105 +106 @@
 
 <tr class="<TMPL_VAR NAME=rowa>">
-<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_IF vrf> (<TMPL_VAR NAME=vrf>)</TMPL_IF></option></TMPL_LOOP>
 </select>
 Allow automatic allocation from private IP ranges:<input type="checkbox" name="allowpriv"></td>

trunk/templates/confirm.tmpl

@@ -44 +44 @@
 
 <tr class="row0">
-<td>Demarc switch/wifi tower:</td>
+<td>Layer-2/demarc node:</td>
 <td><TMPL_VAR NAME=nodename></td>
 </tr>
@@ -84 +84 @@
 <td class="center" colspan="2">
 <TMPL_UNLESS poollist><input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>"></TMPL_UNLESS>
-<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
+<input type="hidden" name="parent" value="<TMPL_VAR NAME=parent>">
+<input type="hidden" name="fbid" value="<TMPL_VAR NAME=fbid>">
 <input type="hidden" name="fullcidr" value="<TMPL_VAR NAME=cidr>">
 <input type="hidden" name="rdns" value="<TMPL_VAR NAME=rdns>">

trunk/templates/insert.tmpl

@@ -12 +12 @@
 </TMPL_IF>
 </div>
-<div class="center">IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parent>&amp;rdepth=<TMPL_VAR NAME=rdepth>"><TMPL_VAR NAME=parent></a></div>
+<div class="center">IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR 
+NAME=parent>"><TMPL_VAR NAME=pool></a></div>
 <TMPL_ELSE>
 <div class="center">
@@ -20 +21 @@
 </TMPL_IF>
 </div>
-<div class="center">Allocations in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=parent>&amp;rdepth=<TMPL_VAR NAME=rdepth>"><TMPL_VAR NAME=parent></a></div>
+<div class="center">Allocations in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=parentid>"><TMPL_VAR NAME=parentblock></a></div>
 </TMPL_IF>
 </TMPL_IF>