Changeset 727 for trunk/templates


Ignore:
Timestamp:
05/20/15 16:02:58 (10 years ago)
Author:
Kris Deugau
Message:

/trunk

Refine variable passing and template variable names on merge prep pages
for accuracy and clarity. See #8.

Location:
trunk/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/templates/confmerge.tmpl

    r720 r727  
    1111<input type="hidden" name="action" value="domerge">
    1212<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
     13<input type="hidden" name="scope" value="<TMPL_VAR NAME=scope>">
    1314<TMPL_IF ismaster>
    1415<input type="hidden" name="typelist" value="mm">
    … …  
    5455<tr>
    5556<td>Merge scope:</td>
    56 <td><TMPL_VAR NAME=scope></td>
     57<td><TMPL_VAR NAME=vis_scope></td>
    5758</tr>
    5859</TMPL_IF>
    … …  
    8384</tr>
    8485</table>
    85 <TMPL_IF ismaster><input type="hidden" name="alloctype" value="mm"></TMPL_IF>
     86<TMPL_IF ismaster>
     87<input type="hidden" name="alloctype" value="mm">
     88</TMPL_IF>
    8689</fieldset>
    8790</form>

  • trunk/templates/merge.tmpl

    r719 r727  
    1313<TMPL_IF ismaster>
    1414<input type="hidden" name="alloctype" value="mm">
     15<input type="hidden" name="scope" value="mergepeer">
    1516</TMPL_IF>
    1617
    … …  
    5354<td>Merge scope:<br>(new or existing container types only)</td>
    5455<td>
    55 <input type="radio" name="mscope" value="keepall">Keep mergable allocations as suballocations of new block<br>
    56 <input type="radio" name="mscope" value="mergepeer" checked="checked">Make suballocations direct children of new block<br>
    57 <input type="radio" name="mscope" value="clearpeer">Keep only suballocations of <TMPL_VAR NAME=oldblock><br>
    58 <input type="radio" name="mscope" value="clearall">Clear all suballocations
     56<input type="radio" name="scope" value="keepall">Keep mergable allocations as suballocations of new block<br>
     57<input type="radio" name="scope" value="mergepeer" checked="checked">Keep suballocations of mergeable allocations<br>
     58<input type="radio" name="scope" value="clearpeer">Keep only suballocations of <TMPL_VAR NAME=oldblock><br>
     59<input type="radio" name="scope" value="clearall">Clear all suballocations
    5960</td>
    6061</tr>
Note: See TracChangeset for help on using the changeset viewer.