Ignore:
Timestamp:
10/09/13 15:36:14 (11 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Brown-paper-bag fixup commit:

  • add another type to the set which can use nodes
  • template and code changes to let admin allocations includ VRF info
  • fix subtle bug in getTypeList() that returned the Routing type when it shouldn't
  • compare and display VRF info on searches
  • minor HTML formatting tweaks for clarity

Bump version to 2.8.1

Location:
branches/stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/stable

    • Property svn:mergeinfo changed
      /trunkmerged: 603
  • branches/stable/templates/admin/alloc.tmpl

    r594 r605  
    3535</tr>
    3636<tr class="row0">
     37<td>VRF identifier:</td><td><input name=vrf size=40></td>
     38</tr>
     39<tr class="row1">
    3740<td>Description/Name:</td><td><input name="desc" size="40"></td>
    3841</tr>
    39 <tr class="row1">
     42<tr class="row0">
    4043<td>Notes:</td><td><textarea name="notes" rows="3" cols="40"></textarea></td>
    4144</tr>
  • branches/stable/templates/admin/header.tmpl

    r601 r605  
    1212<div>
    1313
    14 <TMPL_UNLESS mainpage><a href="<TMPL_VAR NAME=webpath>/cgi-bin/admin.cgi">Back</a> to main<hr></TMPL_UNLESS>
     14<TMPL_UNLESS mainpage><a href="<TMPL_VAR NAME=webpath>/cgi-bin/admin.cgi">Back</a> to Admin Tools<hr></TMPL_UNLESS>
    1515
  • branches/stable/templates/assign.tmpl

    r598 r605  
    3030<td>Allocation:</td>
    3131<td>
    32 <input name="block" value="<TMPL_VAR NAME=block>">
     32<input name="block" size="25" value="<TMPL_VAR NAME=block>">
    3333<input type="hidden" name="fbassign" value="y">
    3434</td>
  • branches/stable/templates/search/sresults.tmpl

    r593 r605  
    2121<td><TMPL_VAR NAME=disptype></td>
    2222<td><TMPL_VAR NAME=city></td>
    23 <td><TMPL_VAR NAME=desc></td>
     23<td><TMPL_VAR NAME=desc><TMPL_IF vrf> - vrf:<TMPL_VAR NAME=vrf></TMPL_IF></td>
    2424</tr>
    2525</TMPL_LOOP>
Note: See TracChangeset for help on using the changeset viewer.