Changeset 705 for trunk/templates


Ignore:
Timestamp:
02/25/15 18:09:13 (10 years ago)
Author:
Kris Deugau
Message:

/trunk

  • Complete internal handling for "shrink block". See #7 (more or less).
  • Add "breadcrumb" navigation fragments to split/shrink prep and do pages
  • Add link to pool IP list on edit and split/shrink prep pages
  • Shave off some useless code showing the split results
  • Catch the theoretically impossible case of "no subact value" on submitting split/shrink form

Still need to add calls to monkey rDNS on split/shrink changes

Location:
trunk/templates
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/templates/dosplit.tmpl

    r702 r705  
    77
    88<table class="indent altrows" cellspacing="1" cellpadding="1">
    9 <tr class="heading"><td>Allocation resized:</td></tr>
     9<tr class="heading"><td colspan="2">Allocation resized:</td></tr>
    1010
    1111<tr>
     
    1818<td>New netblocks:</td>
    1919<td>
    20 <TMPL_LOOP NAME=newblocks><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&id=<TMPL_VAR
    21 NAME=nid>&basetype=b"><TMPL_VAR NAME=nblock><TMPL_UNLESS __last__><br></TMPL_UNLESS>
     20<TMPL_LOOP NAME=newblocks><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&id=<TMPL_VAR NAME=nid>&basetype=b"><TMPL_VAR NAME=nblock><TMPL_UNLESS __last__><br></TMPL_UNLESS>
    2221</TMPL_LOOP>
    2322</td>
     
    2524<TMPL_ELSE>
    2625<tr>
    27 <td>New netblock:</td>
    28 <td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&id=<TMPL_VAR NAME=nid>&basetype=b"><TMPL_VAR NAME=newblock></a></td>
     26<td>Shrunk netblock:</td>
     27<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&id=<TMPL_VAR NAME=nid>&basetype=b"><TMPL_VAR
     28NAME=newblock></a></td>
    2929</tr>
    3030<tr>
    3131<td>New free block:</td>
    32 <td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=newfree>&amp;fbid=<TMPL_VAR NAME=fbid>&amp;parent=<TMPL_VAR NAME=fbparent>"><TMPL_VAR NAME=newfree></a></td>
     32<td><TMPL_LOOP name=newfb><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR
     33NAME=newfree>&amp;fbid=<TMPL_VAR NAME=fbid>&amp;parent=<TMPL_VAR NAME=fbparent>"><TMPL_VAR
     34NAME=newfree></a><TMPL_UNLESS __last__><br></TMPL_UNLESS></TMPL_LOOP>
     35</td>
    3336</tr>
    3437</TMPL_IF>
  • trunk/templates/edit.tmpl

    r702 r705  
    1515
    1616<table class="altrows" cellspacing="1">
    17 <tr class="heading"><td>Edit the information below</td></tr>
     17<tr class="heading">
     18<td colspan="2">Edit the information below
     19<TMPL_IF ispool>
     20<div style="float:right;"><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&pool=<TMPL_VAR NAME=id>">List IPs</a></div></TMPL_IF>
     21</td></tr>
    1822
    1923<tr>
  • trunk/templates/split.tmpl

    r702 r705  
    1313
    1414<table class="regular altrows" cellspacing="1" cellpadding="1">
    15 <tr class="heading"><td>Split/shrink allocation</td></tr>
     15<tr class="heading">
     16<td colspan="2">Split/shrink allocation
     17<TMPL_IF ispool>
     18<div style="float:right;"><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&pool=<TMPL_VAR
     19NAME=block>">List IPs</a></div>
     20</TMPL_IF></td>
     21</tr>
    1622<tr>
    1723<td>Current netblock:</td>
     
    3440</tr>
    3541
     42<TMPL_IF ispool>
     43<tr>
     44<td colspan="2" class="warning">Warning:  Proceeding may remove pool IP entries</td>
     45</tr>
     46</TMPL_IF>
     47
    3648<tr>
    3749<td class="center" colspan="2"><input type="submit" value="  Split/Shrink  "></td>
Note: See TracChangeset for help on using the changeset viewer.