Changeset 575 for trunk/templates


Ignore:
Timestamp:
12/21/12 17:43:19 (12 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

Location:
trunk/templates
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/templates/assign.tmpl

    r530 r575  
    11<div class="indent">
    2 <TMPL_IF block>
    3 <div class="tblsubtitle">
    4 Assign free <TMPL_IF iscontained><TMPL_VAR NAME=fbdisptype></TMPL_IF> block <TMPL_VAR NAME=block>
    5 </div>
    6 <TMPL_ELSE>
    7 <div class="tblsubtitle">Assign IPs</div>
    8 </TMPL_IF>
     2<div class="tblsubtitle">Assign IP<TMPL_UNLESS fbip>s</TMPL_UNLESS></div>
    93<br>
    104
    … …  
    126<fieldset><legend class="noshow">&nbsp;</legend>
    137
    14 <TMPL_IF block>
    15 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
     8<table class="regular" cellspacing="1" cellpadding="1">
     9
     10<TMPL_IF allocfrom>
     11<tr class="row0">
     12<TMPL_IF fbip>
     13<td>IP pool:</td>
     14<TMPL_ELSE>
     15<td>Free block selected:</td>
     16</TMPL_IF>
     17<td><TMPL_VAR NAME=allocfrom><input type="hidden" name="allocfrom" value="<TMPL_VAR NAME=allocfrom>">
     18<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
     19</td>
     20</tr>
     21<tr class="row1">
     22<TMPL_IF fbip>
     23<td>IP:</td>
     24<td>
     25<TMPL_VAR NAME=block><input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
    1626<input type="hidden" name="fbassign" value="y">
     27</td>
     28<TMPL_ELSE>
     29<td>Allocation:</td>
     30<td>
     31<input name="block" value="<TMPL_VAR NAME=block>">
     32<input type="hidden" name="fbassign" value="y">
     33</td>
    1734</TMPL_IF>
    18 
    19 <table class="regular" cellspacing="1" cellpadding="1">
     35</tr>
     36</TMPL_IF>
    2037
    2138<tr class="row0">
    … …  
    3451<td>Allocation type:</td>
    3552<td>
    36 <TMPL_IF iscontained>
     53<TMPL_IF fbip>
    3754<TMPL_VAR NAME=fbdisptype><input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
    3855<TMPL_ELSE>
    … …  
    4663</tr>
    4764
    48 <TMPL_UNLESS block>
     65<TMPL_UNLESS allocfrom>
    4966<tr class="row0">
    5067<td>Subnet CIDR mask length:</td>
    … …  
    6683        <option value="<TMPL_VAR NAME=node_id>"><TMPL_VAR NAME=node_name></option></TMPL_LOOP>
    6784</select>
    68 &nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new location</a>
     85&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new demarc/tower</a>
    6986</td>
    7087</tr>
    7188
    72 <TMPL_UNLESS block>
     89<TMPL_UNLESS allocfrom>
    7390<tr class="<TMPL_VAR NAME=rowa>">
    7491<td>Route from/through:</td>

  • trunk/templates/confirm.tmpl

    r517 r575  
    2323<td>
    2424<select name="alloc_from">
    25 <TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolblock>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
     25<TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolblock>,<TMPL_VAR NAME=poolrdepth>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
    2626</TMPL_LOOP></select>
    2727</td>
    … …  
    7777<td class="center" colspan="2">
    7878<TMPL_UNLESS poollist><input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>"></TMPL_UNLESS>
     79<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
    7980<input type="hidden" name="fullcidr" value="<TMPL_VAR NAME=cidr>">
    8081<input type="hidden" name="city" value="<TMPL_VAR NAME=city>">

  • trunk/templates/insert.tmpl

    r517 r575  
    1 <TMPL_IF webpath></TMPL_IF>
    21<TMPL_IF err>
    32<div class="err">
    … …  
    1312</TMPL_IF>
    1413</div>
     14<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>
    1515<TMPL_ELSE>
    1616<div class="center">
    … …  
    2020</TMPL_IF>
    2121</div>
     22<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>
    2223</TMPL_IF>
    2324</TMPL_IF>

  • trunk/templates/listpool.tmpl

    r570 r575  
    4040<td><TMPL_VAR NAME=desc></td>
    4141<TMPL_IF maydel><td><TMPL_IF delme>
    42 <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=delete&amp;block=<TMPL_VAR NAME=ip>&amp;alloctype=<TMPL_VAR NAME=type>">Unassign this IP</a>
     42<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=delete&amp;block=<TMPL_VAR NAME=ip>&amp;rdepth=<TMPL_VAR NAME=ipdepth>&amp;alloctype=<TMPL_VAR NAME=type>">Unassign this IP</a>
    4343</TMPL_IF></td></TMPL_IF>
    4444</tr>
Note: See TracChangeset for help on using the changeset viewer.