Changeset 638 for trunk/templates

Timestamp:

10/09/14 18:13:22 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• Update block delete. Includes a little current work to fix outstanding edge case issues

Location:

trunk/templates

Files:

• delete.tmpl (modified) (2 diffs)
• finaldelete.tmpl (modified) (1 diff)

trunk/templates/delete.tmpl

@@ -2 +2 @@
 <div class="heading">Please confirm removal of:</div>
 <br>
+<TMPL_VAR NAME=err>
 
 <form action="main.cgi" method="POST" class="regular">
@@ -69 +70 @@
 <td class="center" colspan="2">
 <input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
-<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
-<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
+<input type="hidden" name="block" value="<TMPL_VAR NAME=blockid>">
+<input type="hidden" name="basetype" value="<TMPL_VAR NAME=basetype>">
 <input type="hidden" name="action" value="finaldelete">
 </td>

trunk/templates/finaldelete.tmpl

@@ -6 +6 @@
 <div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
 <TMPL_IF genwarn><br><div><TMPL_VAR NAME=genwarn></div></TMPL_IF>
-<TMPL_IF bparent><br><div>
+<TMPL_IF parent_id><br><div>
 Warning:  
-<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in <TMPL_VAR NAME=bparent>
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=bparent>&amp;rdepth=<TMPL_VAR NAME=brdepth>"><TMPL_VAR NAME=bparent></a>,<br>
+<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent></a>,<br>
 not released for general netblock assignment under
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=delparent>&amp;rdepth=<TMPL_VAR NAME=prdepth>"><TMPL_VAR NAME=delparent></a>.
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a>.
 <TMPL_ELSE>
-<TMPL_VAR NAME=block> was released as free and merged with blocks under 
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=bparent>&amp;rdepth=<TMPL_VAR NAME=brdepth>"><TMPL_VAR NAME=bparent></a>,
-not <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=delparent>&amp;rdepth=<TMPL_VAR NAME=prdepth>"><TMPL_VAR NAME=delparent></a>.
+<TMPL_VAR NAME=block> was released as free and merged with blocks under <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent></a>,
+not <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a>.
 </TMPL_IF>
 </div>
 <TMPL_ELSE>
-<TMPL_IF delparent><div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=delparent>&amp;rdepth=<TMPL_VAR NAME=prdepth>"><TMPL_VAR NAME=delparent></a></div></TMPL_IF>
+<TMPL_IF delparent_id>
+<TMPL_IF returnpool>
+<div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a></div>
+<TMPL_ELSE>
+<div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a></div>
+</TMPL_IF>
+</TMPL_IF>
 </TMPL_IF>
 </TMPL_IF>