Changeset 733 for trunk/templates/merge.tmpl

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.

File:

• trunk/templates/merge.tmpl (modified) (1 diff)

trunk/templates/merge.tmpl

@@ -54 +54 @@
 <td>Merge scope:<br>(new or existing container types only)</td>
 <td>
-<input type="radio" name="scope" value="keepall">Keep mergable allocations as suballocations of new block<br>
-<input type="radio" name="scope" value="mergepeer" checked="checked">Keep suballocations of mergeable allocations<br>
-<input type="radio" name="scope" value="clearpeer">Keep only suballocations of <TMPL_VAR NAME=oldblock><br>
-<input type="radio" name="scope" value="clearall">Clear all suballocations
+<input type="radio" name="scope" value="keepall"><TMPL_VAR NAME=vis_keepall><br>
+<input type="radio" name="scope" value="mergepeer" checked="checked"><TMPL_VAR NAME=vis_mergepeer><br>
+<input type="radio" name="scope" value="clearpeer"><TMPL_VAR NAME=vis_clearpeer><br>
+<input type="radio" name="scope" value="clearall"><TMPL_VAR NAME=vis_clearall>
 </td>
 </tr>