Ignore:
Timestamp:
05/15/13 16:17:00 (11 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge SQL changes and other miscellaneous fixes from /trunk through r553.

Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable

  • branches/stable/templates/admin/main.tmpl

    r593 r594  
    88Allocate block/IP: <input name="cidr"> as
    99<select name="alloctype">
    10 <TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_UNLESS selected> selected</TMPL_UNLESS>><TMPL_VAR NAME=dispname></option>
     10<TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=listname></option>
    1111</TMPL_LOOP>
    1212</select>
     
    2929Bump "last updated" timestamp on this master:
    3030<select name="whichmaster">
    31 <TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=masterdate>)</option>
     31<TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=mtime>)</option>
    3232</TMPL_LOOP>
    3333</select>
Note: See TracChangeset for help on using the changeset viewer.