Changeset 577 for trunk/templates


Ignore:
Timestamp:
12/21/12 17:55:49 (11 years ago)
Author:
Kris Deugau
Message:

/trunk

Work in progress, see #5:
Update templates and calling code for allocation delete to pass
and use rdepth
Start adding support for reparented netblocks; when a reparented
block is deleted, link back not only to the parent it was living
in, but the "true" parent the free space was merged with.

Location:
trunk/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/templates/delete.tmpl

    r538 r577  
    6060<input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
    6161<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
    62 <input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
     62<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
    6363<input type="hidden" name="action" value="finaldelete">
    6464</fieldset>
  • trunk/templates/finaldelete.tmpl

    r517 r577  
    1 <TMPL_IF webpath></TMPL_IF>
    21<div class="center">
    32<TMPL_IF failmsg>
     
    65<TMPL_ELSE>
    76<div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
     7<TMPL_IF bparent><br><div>
     8Warning: 
     9<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in <TMPL_VAR NAME=bparent>
     10<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>
     11not released for general netblock assignment under
     12<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>.
     13<TMPL_ELSE>
     14<TMPL_VAR NAME=block> was released as free and merged with blocks under
     15<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>,
     16not <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>.
     17</TMPL_IF>
     18</div>
     19<TMPL_ELSE>
     20<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>
     21</TMPL_IF>
    822</TMPL_IF>
    923</div>
Note: See TracChangeset for help on using the changeset viewer.