--- loncom/interface/lonparmset.pm	2005/11/11 20:37:47	1.264
+++ loncom/interface/lonparmset.pm	2006/05/15 23:46:03	1.268.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.264 2005/11/11 20:37:47 albertel Exp $
+# $Id: lonparmset.pm,v 1.268.2.4 2006/05/15 23:46:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,6 +126,7 @@ sub parmval_by_symb {
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$what;
     my $mapparm=$map.'___(all).'.$what;
@@ -316,6 +317,8 @@ sub storeparm_by_symb {
 # store parameter
     &storeparm_by_symb_inner
 	($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+# don't do anything if parameter was reset
+    unless ($nval) { return; }
     my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
 # remember that this was set
     $recstack{$parm}=1;
@@ -361,6 +364,8 @@ sub storeparm_by_symb_inner {
 # ---------------------------------------------------------- Construct prefixes
     $spnam=~s/\_([^\_]+)$/\.$1/;
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    $map = &Apache::lonnet::deversion($map);
+
     my $symbparm=$symb.'.'.$spnam;
     my $mapparm=$map.'___(all).'.$spnam;
 
@@ -527,10 +532,10 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    return 
+    return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$marker.'" /></td></tr><tr><td align="center">'.
 	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
 	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
-		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
+		&valout($value,$type).'</a></td></tr></table>';
 }
 
 sub startpage {
@@ -1456,14 +1461,15 @@ ENDTABLEHEADFOUR
                     my $totalparms=scalar keys %name;
                     if ($totalparms>0) {
                         my $firstrow=1;
-			my $title=&Apache::lonnet::gettitle($uri);
+			my $title=&Apache::lonnet::gettitle($symbp{$rid});
                         $r->print('<tr><td bgcolor='.$defbgone.
                              ' rowspan='.$totalparms.
                              '><tt><font size=-1>'.
                              join(' / ',split(/\//,$uri)).
                              '</font></tt><p><b>'.
                              "<a href=\"javascript:openWindow('".
-				  &Apache::lonnet::clutter($uri).
+				  &Apache::lonnet::clutter($uri).'?symb='.
+				  &Apache::lonnet::escape($symbp{$rid}).
                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
                              " TARGET=_self>$title");
 
@@ -1571,10 +1577,7 @@ Set Defaults for All Resources in $folde
 Specifically for
 ENDMAPONE
                 if ($uname) {
-                    my %name=&Apache::lonnet::userenvironment($udom,$uname,
-                      ('firstname','middlename','lastname','generation', 'id'));
-                    my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
-                           .$name{'lastname'}.' '.$name{'generation'};
+		    my $person=&Apache::loncommon::plainname($uname,$udom);
                     $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
                         &mt('in')." \n");
                 } else {
@@ -1652,10 +1655,7 @@ ENDMAPONE
 <font color="red"><i>$coursename</i></font><br />
 ENDMAPONE
             if ($uname) {
-                my %name=&Apache::lonnet::userenvironment($udom,$uname,
-                  ('firstname','middlename','lastname','generation', 'id'));
-                my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
-                       .$name{'lastname'}.' '.$name{'generation'};
+		my $person=&Apache::loncommon::plainname($uname,$udom);
                 $r->print(" ".&mt("User")."<font color=\"red\"> <i>$uname \($person\) </i></font> \n");
             } else {
                 $r->print("<i><font color=\"red\"> ".&mt("ALL")."</i> ".&mt("USERS")."</font> \n");
@@ -1897,8 +1897,8 @@ sub crsenv {
 	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
                     &mt('This controls how receipt numbers are generated.'),
              'suppress_tries'
-                 => '<b>'.&mt('Suppress number of tries in printing').'</b>('.
-                    &mt('yes if supress').')',
+                 => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
+                    ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
              'problem_stream_switch'
                  => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
                     ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
@@ -2696,6 +2696,8 @@ ENDMAINFORMHEAD
 #
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+
     my @menu =
         (
           { text => 'Set Course Environment Parameters',
@@ -2706,6 +2708,12 @@ ENDMAINFORMHEAD
 	    action => 'setrestrictmeta',
             permission => $parm_permission,
             },
+	  { text => 'Manage Course Slots',
+	    url => '/adm/slotrequest?command=showslots',
+	    permission => $vgr,
+            },
+	  { divider => 1,
+	    },
           { text => 'Set/Modify Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
             permission => $parm_permission,
@@ -2730,6 +2738,10 @@ ENDMAINFORMHEAD
           );
     my $menu_html = '';
     foreach my $menu_item (@menu) {
+	if ($menu_item->{'divider'}) {
+	    $menu_html .= '<hr />';
+	    next;
+	}
         next if (! $menu_item->{'permission'});
         $menu_html.='<p>';
         $menu_html.='<font size="+1">';
@@ -2820,7 +2832,10 @@ sub setrestrictmeta {
     &Apache::lonnet::coursedescription($env{'request.course.id'});
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     foreach my $field (sort(keys(%metadata_fields))) {
-	$output.= &output_row($r, $field, $metadata_fields{$field});
+        &Apache::lonnet::logthis ($field);
+        if ($field ne 'courserestricted') {
+	    $output.= &output_row($r, $field, $metadata_fields{$field});
+	}
     }
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">