--- loncom/interface/lonparmset.pm	2010/06/06 02:40:30	1.496
+++ loncom/interface/lonparmset.pm	2010/07/29 21:16:44	1.500
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.496 2010/06/06 02:40:30 raeburn Exp $
+# $Id: lonparmset.pm,v 1.500 2010/07/29 21:16:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1685,13 +1685,13 @@ sub displaymenu {
 }
 
 sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles, $symbp)=@_;
+    my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
     my %allmaps_inverted = reverse %$allmaps;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $tree=[];
     my $treeinfo={};
     if (defined($navmap)) {
-        my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+        my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
         my $curRes;
         my $depth = 0;
         my %parent = ();
@@ -1736,35 +1736,58 @@ sub mapmenu {
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
-        $r->print(&Apache::loncommon::start_data_table()
-                 .&Apache::loncommon::start_data_table_row()
-                 .'<td>'.$icon
-                 .'<label>&nbsp;'
-                 .'<input type="radio" name="pschp" checked="checked" value="all" />'
-                 .&mt('All Maps or Folders')
-                 .'</label></td>'
-                 .&Apache::loncommon::end_data_table_row()
+        my $whitespace =
+            '<img src="'
+           .&Apache::loncommon::lonhttpdurl('/adm/lonIcons/whitespace_21.gif')
+           .'" alt="" />';
+
+        # Info about selectable folders/maps
+        $r->print(
+            '<div class="LC_info">'
+           .&mt('You can only select those maps and folders which can be currently parameterized.')
+         # .' '.&Apache::loncommon::help_open_topic('...') # Later: Add further help
+           .'</div>'
         );
-        my $whitespace = '<img src="'
-                        .&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif")
-                        .'" alt="" />';
+
+
+        $r->print(&Apache::loncommon::start_data_table());
+
+        # Display row: "All Maps or Folders"
+        $r->print(
+            &Apache::loncommon::start_data_table_row()
+           .'<td>'
+           .'<label>'
+           .'<input type="radio" name="pschp"'
+        );
+        $r->print(' checked="checked"') if ($pschp eq 'all' || !$pschp);
+        $r->print(
+            ' value="all" />&nbsp;'.$icon.'&nbsp;'
+           .&mt('All Maps or Folders')
+           .'</label>'
+           .'<hr /></td>'
+           .&Apache::loncommon::end_data_table_row()
+        );
+
+        # Display row: "Main Course Documents"
         if (exists($$allmaps{1})) {
-            $r->print(&Apache::loncommon::start_data_table_row()
-                .'<td>'.$icon
-                .'<label>&nbsp;'
-                .'<input type="radio" name="pschp" value="1"'
+            $r->print(
+                &Apache::loncommon::start_data_table_row()
+               .'<td>'
+               .'<label>'
+               .'<input type="radio" name="pschp" value="1"'
             );
-            if ($pschp eq 1) {
-                $r->print(' checked="checked"');
-            }
-            $r->print('/>'
-                .$$maptitles{1}
-                .($$allmaps{1} !~/^uploaded/?' ['.$$allmaps{1}.']':'')
-                .'</label>'
-                .'</td>'
-                .&Apache::loncommon::end_data_table_row()
+            $r->print(' checked="checked"') if ($pschp eq '1');
+            $r->print(
+                '/>&nbsp;'.$icon.'&nbsp;'
+               .$$maptitles{1}
+               .($$allmaps{1} !~/^uploaded/?' ['.$$allmaps{1}.']':'')
+               .'</label>'
+               .'</td>'
+               .&Apache::loncommon::end_data_table_row()
             );
         }
+
+        # Display rows for all course maps and folders
         foreach my $id (@{$tree}) {
             my ($mapid,$resid)=split(/\./,$id);
             # Indentation
@@ -1780,22 +1803,32 @@ sub mapmenu {
             my $symb_name = $$symbp{$id};
             my ($front, $tail) = split (/___${resid}___/, $symb_name);
             $symb_name = $tail;
-            $r->print(&Apache::loncommon::start_data_table_row()
-                     .'<td>'.$indent.$icon
-                     .'<label>&nbsp;'
-                     .'<input type ="radio" name="pschp" value="'.$allmaps_inverted{$symb_name}.'"'
+            $r->print(
+                &Apache::loncommon::start_data_table_row()
+               .'<td>'
+               .'<label>'
             );
-            if ($pschp eq $allmaps_inverted{$symb_name}) {
-                $r->print(' checked="checked"');
+            # Only offer radio button for folders/maps which can be parameterized
+            if ($allmaps_inverted{$symb_name}) {
+                $r->print(
+                    '<input type ="radio" name="pschp"'
+                   .' value="'.$allmaps_inverted{$symb_name}.'"'
+                );
+                $r->print(' checked="checked"') if ($allmaps_inverted{$symb_name} eq $pschp);
+                $r->print('/>');
+            } else {
+                $r->print($whitespace);
             }
-            $r->print('/>'
-                     .$treeinfo->{$id}->{name}
-                     .($$allmaps{$mapid}!~/^uploaded/?' ['.$$allmaps{$mapid}.']':'')
-                     .'</label>'
-                     .'</td>'
-                     .&Apache::loncommon::end_data_table_row()
+            $r->print(
+                $indent.$icon.'&nbsp;'
+               .$treeinfo->{$id}->{name}
+               .($$allmaps{$mapid}!~/^uploaded/?' ['.$$allmaps{$mapid}.']':'')
+               .'</label>'
+               .'</td>'
+               .&Apache::loncommon::end_data_table_row()
             );
         }
+
         $r->print(&Apache::loncommon::end_data_table());
     }
 }
@@ -2080,10 +2113,10 @@ sub assessparms {
         my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
         my @values=split(/\&\&\&/,$env{'form.pres_value'});
         my @types=split(/\&\&\&/,$env{'form.pres_type'});
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         for (my $i=0;$i<=$#markers;$i++) {
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
-                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
                 my ($level,@all) =
@@ -2113,6 +2146,10 @@ sub assessparms {
                         }
                     }
                 }
+            } elsif ($markers[$i] =~ /_type\&\d+$/) {
+                if (($values[$i] eq 'anonsurvey') || ($values[$i] eq 'anonsurveycred')) {
+                    &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:type:'.$values[$i]});
+                }
             }
             $message.=&storeparm(split(/\&/,$markers[$i]),
                  $values[$i],