Ignore:
Timestamp:
05/16/13 16:43:45 (12 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Introduce informational VRF tags on allocations to match uncomitted patch
in production.
Also add a minor main.cgi error-log-cleanup hack around deleting routed
blocks and master blocks instead of bending getBlockData() out of shape
only to have to put it back when the database structure changes get merged.

Location:
branches/stable/templates
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/templates/assign.tmpl

    r595 r598  
    9292</tr>
    9393
     94<tr class="<TMPL_VAR NAME=rowa>"><td>VRF instance</td><td><input name="vrf" size="40" value="<TMPL_VAR NAME=vrf>"></td></tr>
     95
    9496<TMPL_UNLESS allocfrom>
    95 <tr class="<TMPL_VAR NAME=rowa>">
     97<tr class="<TMPL_VAR NAME=rowb>">
    9698<td>Limit to blocks in this location:</td>
    9799<td>
    … …  
    104106</tr>
    105107
    106 <tr class="<TMPL_VAR NAME=rowb>">
     108<tr class="<TMPL_VAR NAME=rowa>">
    107109<td>Limit to blocks in this master:&nbsp;</td>
    108110<td>
    … …  
    116118</TMPL_UNLESS>
    117119
    118 <tr class="<TMPL_VAR NAME=rowa>">
     120<tr class="<TMPL_VAR NAME=rowb>">
    119121<td>Circuit ID:</td>
    120122<td><input name="circid" size="40"></td>
    121123</tr>
    122124
    123 <tr class="<TMPL_VAR NAME=rowb>">
     125<tr class="<TMPL_VAR NAME=rowa>">
    124126<td>Description/Name:</td>
    125127<td><input name="desc" size="40"></td>
    126128</tr>
    127129
    128 <tr class="<TMPL_VAR NAME=rowa>">
     130<tr class="<TMPL_VAR NAME=rowb>">
    129131<td>Notes:&nbsp;</td>
    130132<td><textarea name="notes" rows="3" cols="40"></textarea></td>
    … …  
    132134
    133135<TMPL_IF privdata>
    134 <tr class="<TMPL_VAR NAME=rowb>">
     136<tr class="<TMPL_VAR NAME=rowa>">
    135137<td>Restricted data:</td>
    136138<td><textarea rows="3" cols="64" name="privdata" class="regular"></textarea></td>
    … …  
    138140</TMPL_IF>
    139141
    140 <tr class="<TMPL_IF privdata><TMPL_VAR NAME=rowa><TMPL_ELSE><TMPL_VAR NAME=rowb></TMPL_IF>">
     142<tr class="<TMPL_IF privdata><TMPL_VAR NAME=rowb><TMPL_ELSE><TMPL_VAR NAME=rowb></TMPL_IF>">
    141143<td class="center" colspan="2"><input type="submit" value="  Assign  "></td>
    142144</tr>

  • branches/stable/templates/confirm.tmpl

    r593 r598  
    4242
    4343<tr class="row0">
     44<td>VRF instance:&nbsp;</td>
     45<td><TMPL_VAR NAME=vrf><input type="hidden" name="vrf" value="<TMPL_VAR NAME=vrf>"></td>
     46</tr>
     47
     48<tr class="row1">
    4449<td>Allocation type:</td>
    4550<td><TMPL_VAR NAME=typefull></td>
    4651</tr>
    4752
    48 <tr class="row1">
     53<tr class="row0">
    4954<td>Customer ID:</td>
    5055<td><TMPL_VAR NAME=custid></td>
    5156</tr>
    5257
    53 <tr class="row0">
     58<tr class="row1">
    5459<td valign="top">Circuit ID:</td>
    5560<td><TMPL_VAR NAME=circid></td>
    5661</tr>
    5762
    58 <tr class="row1">
     63<tr class="row0">
    5964<td valign="top">Description/name:</td>
    6065<td><TMPL_VAR NAME=desc></td>
    6166</tr>
    6267
    63 <tr class="row0">
     68<tr class="row1">
    6469<td valign="top">Notes:</td>
    6570<td><TMPL_VAR NAME=notes></td>
    … …  
    6772
    6873<TMPL_IF privdata>
    69 <tr class="row1">
     74<tr class="row0">
    7075<td>Restricted data:</td>
    7176<td><TMPL_VAR NAME=privdata></td>
    … …  
    7479
    7580<!-- warn -->
    76 <tr class="<TMPL_IF privdata>row0<TMPL_ELSE>row1</TMPL_IF>">
     81<tr class="<TMPL_IF privdata>row1<TMPL_ELSE>row0</TMPL_IF>">
    7782<td class="center" colspan="2">
    7883<TMPL_UNLESS poollist><input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>"></TMPL_UNLESS>

  • branches/stable/templates/delete.tmpl

    r594 r598  
    6161<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
    6262<input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
     63<input type="hidden" name="city" value="<TMPL_VAR NAME=city>">
    6364<input type="hidden" name="action" value="finaldelete">
    6465</fieldset>

  • branches/stable/templates/edit.tmpl

    r594 r598  
    6767
    6868<tr class="row0">
     69<td class=heading>VRF instance:</td>
     70<td class="regular">
     71<TMPL_IF maychange>
     72<input type="text" name="vrf" value="<TMPL_VAR NAME=vrf>">
     73<TMPL_ELSE>
     74<TMPL_VAR NAME=vrf>
     75</TMPL_IF>
     76</td>
     77</tr>
     78
     79<tr class="row1">
    6980<td class=heading>CustID:</td>
    7081<td class="regular">
    … …  
    7788</tr>
    7889
    79 <tr class="row1">
     90<tr class="row0">
    8091<td class=heading>SWIPed?:</td>
    8192<td class=regular>
    … …  
    92103</tr>
    93104
    94 <tr class="row0">
     105<tr class="row1">
    95106<td class=heading>Last modified:</td>
    96107<td class=regular><TMPL_VAR NAME=lastmod></td>
    97108</tr>
    98109
    99 <tr class="row1">
     110<tr class="row0">
    100111<td class="heading">Circuit ID:</td>
    101112<td class="regular">
    … …  
    108119</tr>
    109120
    110 <tr class="row0">
     121<tr class="row1">
    111122<td class="heading">Description/Name:</td>
    112123<td class="regular">
    … …  
    119130</tr>
    120131
    121 <tr class="row1">
     132<tr class="row0">
    122133<td class="heading" valign="top">Notes:</td>
    123134<td class="regular">
    … …  
    130141
    131142<TMPL_IF nocling>
    132 <tr class="row0">
     143<tr class="row1">
    133144<td class="heading" valign="top">Restricted data:</td>
    134145<td class="regular">
    … …  
    143154
    144155<TMPL_IF maychange>
    145 <tr class="row<TMPL_IF nocling>1<TMPL_ELSE>0</TMPL_IF>">
     156<tr class="row<TMPL_IF nocling>0<TMPL_ELSE>1</TMPL_IF>">
    146157<td colspan="2" class="center">
    147158<input type="submit" value=" Update this block " class="regular">
    … …  
    160171<form method="POST" action="main.cgi">
    161172<fieldset><legend class="noshow">&nbsp;</legend>
    162 <div class="row<TMPL_IF nocling><TMPL_IF maychange>0<TMPL_ELSE>1</TMPL_IF><TMPL_ELSE><TMPL_IF maychange>1<TMPL_ELSE>0</TMPL_IF></TMPL_IF>">
     173<div class="row<TMPL_IF nocling><TMPL_IF maychange>1<TMPL_ELSE>0</TMPL_IF><TMPL_ELSE><TMPL_IF maychange>0<TMPL_ELSE>1</TMPL_IF></TMPL_IF>">
    163174<input type="hidden" name="action" value="delete">
    164175<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">

  • branches/stable/templates/update.tmpl

    r594 r598  
    3030
    3131<tr class="row0">
     32<td>VRF Instance:</td>
     33<td><TMPL_VAR NAME=vrf></td>
     34</tr>
     35
     36<tr class="row1">
    3237<td>Customer ID:</td>
    3338<td><TMPL_VAR NAME=custid></td>
    3439</tr>
    3540
    36 <tr class="row1">
     41<tr class="row0">
    3742<td>SWIPed?:</td>
    3843<td><TMPL_VAR NAME=swip></td>
    3944</tr>
    4045
    41 <tr class="row0">
     46<tr class="row1">
    4247<td>Circuit ID:</td>
    4348<td><TMPL_VAR ESCAPE=HTML NAME=circid></td>
    4449</tr>
    4550
    46 <tr class="row1">
     51<tr class="row0">
    4752<td valign="top">Description/Name:</td>
    4853<td><TMPL_VAR ESCAPE=HTML NAME=desc></td>
    4954</tr>
    5055
    51 <tr class="row0">
     56<tr class="row1">
    5257<td valign="top">Notes:</td>
    5358<td><TMPL_VAR NAME=notes></td>
    … …  
    5560
    5661<TMPL_IF privdata>
    57 <tr class="row1">
     62<tr class="row0">
    5863<td valign="top">Restricted data:</td>
    5964<td><TMPL_VAR NAME=privdata></td>
Note: See TracChangeset for help on using the changeset viewer.