Changeset 727 for trunk/cgi-bin

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.

File:

• trunk/cgi-bin/main.cgi (modified) (1 diff)

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()