Changeset 733 for trunk/templates


Ignore:
Timestamp:
05/25/15 18:25:20 (9 years ago)
Author:
Kris Deugau
Message:

/trunk

Cleanup while rechecking merge-to-container in UI:

  • Move descriptive strings for merge scopes into a hash in IPDB.pm, so we don't have to update them everywhere every time they might change... now that most of the changes are done, of course.
  • Refiddle listForMerge's freeblock branch to show only direct children, or all free blocks depending on another optional argument.
  • Render previous point pointless due to dropping freeblocks from the return list of merged blocks anyway, because Confusion.
  • Force scope as well as type when merging a master block. Merging any other type in a way that happens to intersect a master remains undefined.
  • Make sure to capture the blocks merged/deleted for return.
  • Fix up some variable names for consistency.
  • Fix stupid typo missed in r732.

See #8.

Location:
trunk/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/templates/confmerge.tmpl

    r727 r733  
    4343</td>
    4444</tr>
    45 <tr>
    46 <td>Existing freeblocks to merge under new allocation:</td>
    47 <td>
    48 <TMPL_LOOP NAME=mergefree><TMPL_VAR NAME=cidr><br>
    49 <input type="hidden" name="fid<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=id>">
    50 </TMPL_LOOP>
    51 </td>
    52 </tr>
    5345
    5446<TMPL_IF iscontainer>

  • trunk/templates/merge.tmpl

    r727 r733  
    5454<td>Merge scope:<br>(new or existing container types only)</td>
    5555<td>
    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
     56<input type="radio" name="scope" value="keepall"><TMPL_VAR NAME=vis_keepall><br>
     57<input type="radio" name="scope" value="mergepeer" checked="checked"><TMPL_VAR NAME=vis_mergepeer><br>
     58<input type="radio" name="scope" value="clearpeer"><TMPL_VAR NAME=vis_clearpeer><br>
     59<input type="radio" name="scope" value="clearall"><TMPL_VAR NAME=vis_clearall>
    6060</td>
    6161</tr>
Note: See TracChangeset for help on using the changeset viewer.