Changeset 727 for trunk

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

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/confmerge.tmpl (modified) (3 diffs)
• templates/merge.tmpl (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -1265 +1265 @@
   $page->param(mergefree => $fb_list);
 
+##fixme:  push this up the stack somewhere so the labels can be fed to the relevant templates when/as needed
   # scope
   my %merge_friendly = (
         keepall   => "Keep mergeable allocations as suballocations of new block",
-        mergepeer => "Make suballocations of mergeable allocations direct children of new block",
+        mergepeer => "Keep suballocations of mergeable allocations",
         clearpeer => "Keep only suballocations of $binfo->{block}",
         clearall  => "Clear all suballocations"
     );
-  $page->param(scope => $merge_friendly{$webvar{mscope}});
+  $page->param(vis_scope => $merge_friendly{$webvar{scope}});
+  $page->param(scope => $webvar{scope});
 } # confMerge()
 

trunk/templates/confmerge.tmpl

@@ -11 +11 @@
 <input type="hidden" name="action" value="domerge">
 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
+<input type="hidden" name="scope" value="<TMPL_VAR NAME=scope>">
 <TMPL_IF ismaster>
 <input type="hidden" name="typelist" value="mm">
@@ -54 +55 @@
 <tr>
 <td>Merge scope:</td>
-<td><TMPL_VAR NAME=scope></td>
+<td><TMPL_VAR NAME=vis_scope></td>
 </tr>
 </TMPL_IF>
@@ -83 +84 @@
 </tr>
 </table>
-<TMPL_IF ismaster><input type="hidden" name="alloctype" value="mm"></TMPL_IF>
+<TMPL_IF ismaster>
+<input type="hidden" name="alloctype" value="mm">
+</TMPL_IF>
 </fieldset>
 </form>

trunk/templates/merge.tmpl

@@ -13 +13 @@
 <TMPL_IF ismaster>
 <input type="hidden" name="alloctype" value="mm">
+<input type="hidden" name="scope" value="mergepeer">
 </TMPL_IF>
 
@@ -53 +54 @@
 <td>Merge scope:<br>(new or existing container types only)</td>
 <td>
-<input type="radio" name="mscope" value="keepall">Keep mergable allocations as suballocations of new block<br>
-<input type="radio" name="mscope" value="mergepeer" checked="checked">Make suballocations direct children of new block<br>
-<input type="radio" name="mscope" value="clearpeer">Keep only suballocations of <TMPL_VAR NAME=oldblock><br>
-<input type="radio" name="mscope" value="clearall">Clear all suballocations
+<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
 </td>
 </tr>