--- loncom/interface/lonparmset.pm	2004/01/28 17:16:27	1.149
+++ loncom/interface/lonparmset.pm	2004/04/27 19:11:14	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.149 2004/01/28 17:16:27 albertel Exp $
+# $Id: lonparmset.pm,v 1.156 2004/04/27 19:11:14 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -359,7 +359,7 @@ sub startpage {
 $selscript
 </head>
 $bodytag
-$overallhelp
+
 ENDHEAD
 
     unless ($trimheader) {$r->print(<<ENDHEAD2);
@@ -439,7 +439,7 @@ sub print_row {
         $parm=~s|\[.*\]\s||g;
     }
 
-    $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
+    $r->print('<td bgcolor='.$defbgone.'>'.&mt($parm).'</td>');
    
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
@@ -587,7 +587,8 @@ sub extractResourceInformation {
 	    my $resid=$2;
 	    my $id=$mapid.'.'.$resid;
 	    my $srcf=$$bighash{$_};
-	    if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+#	    if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+	    if (1) {
 		$$ids[$#$ids+1]=$id;
 		$$typep{$id}=$1;
 		$$keyp{$id}='';
@@ -1151,8 +1152,10 @@ ENDTABLEHEADFOUR
                 my $rid=$_;
                 my ($inmapid)=($rid=~/\.(\d+)$/);
 
-                if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid}) ||
-                    ($pssymb eq $symbp{$rid})) {
+                if ((!$pssymb && 
+		     (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
+		    ||
+		    ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
                     if ($defbgone eq '"E0E099"') {
                         $defbgone='"E0E0DD"';
@@ -1196,7 +1199,8 @@ ENDTABLEHEADFOUR
                              '><tt><font size=-1>'.
                              join(' / ',split(/\//,$uri)).
                              '</font></tt><p><b>'.
-                             "<a href=\"javascript:openWindow('/res/".$uri.
+                             "<a href=\"javascript:openWindow('".
+				  &Apache::lonnet::clutter($uri).
                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
                              " TARGET=_self>$title");
 
@@ -1496,7 +1500,7 @@ sub crsenv {
         }
         #
         # Let the user know we made the changes
-        if ($name) {
+        if ($name && defined($value)) {
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
             if ($put_result eq 'ok') {
@@ -1529,11 +1533,8 @@ sub crsenv {
              'courseid'       => '<b>'.&mt('Course ID').' '.&mt('or').' '.&mt('number').
                                  '</b><br />'.
                                  '('.&mt('internal').', '.&mt('optional').')',
-             'grading'        => '<b>'.&mt('Grading').'</b>'.
-                                 ' "'.&mt('standard').'", "'.&mt('external').'", '.
-                                 &mt('or any other value').'.'.
-                                 '  '.&mt('Default for new courses is').' "'.
-                                 &mt('standard').'".',
+             'grading'        => '<b>'.&mt('Grading').'</b><br />'.
+                                 '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
@@ -1592,14 +1593,19 @@ sub crsenv {
 	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
                     '<font color="red">'.&mt('Modifying this will make problems').' '.
                     &mt('have different numbers and answers').'</font>',
+	     'receiptalg'
+	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
+                    &mt('This controls how receipt numbers are generated.'),
              'problem_stream_switch'
                  => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
                     ' ("<tt>'.&mt('yes').'</tt>" '.&mt('if allowed, anything else if not').')',
              'anonymous_quiz'
-                 => '<b>'.&mt('Anonimous quiz/exam').'</b><br />'.
+                 => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
              'default_enrollment_start_date' => '<b>'.&mt('Default beginning date when enrolling students').'</b>',
              'default_enrollment_end_date'   => '<b>'.&mt('Default ending date when enrolling students').'</b>',
+             'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b>'.
+                                 '<br />(<tt>user:domain,user:domain,...</tt>)',
              'languages' => '<b>'.&mt('Languages used').'</b>',
              'disable_receipt_display'
                  => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
@@ -1614,7 +1620,9 @@ sub crsenv {
                              'pch.roles.denied','pch.users.denied',
                              'allow_limited_html_in_feedback',
                              'languages',
+			     'nothideprivileged',
                              'rndseed',
+                             'receiptalg',
                              'problem_stream_switch',
                              'disable_receipt_display',
                              'spreadsheet_default_classcalc',
@@ -1671,31 +1679,11 @@ sub crsenv {
     my $Parameter=&mt('Parameter');
     my $Value=&mt('Value');
     my $Set=&mt('Set');
+    my $browse_js=&Apache::loncommon::browser_and_searcher_javascript();
     $r->print(<<ENDENV);
 <html>
 <script type="text/javascript" language="Javascript" >
-    var editbrowser;
-    function openbrowser(formname,elementname,only,omit) {
-        var url = '/res/?';
-        if (editbrowser == null) {
-            url += 'launch=1&';
-        }
-        url += 'catalogmode=interactive&';
-        url += 'mode=parmset&';
-        url += 'form=' + formname + '&';
-        if (only != null) {
-            url += 'only=' + only + '&';
-        } 
-        if (omit != null) {
-            url += 'omit=' + omit + '&';
-        }
-        url += 'element=' + elementname + '';
-        var title = 'Browser';
-        var options = 'scrollbars=1,resizable=1,menubar=0';
-        options += ',width=700,height=600';
-        editbrowser = open(url,title,options,'1');
-        editbrowser.focus();
-    }
+$browse_js
 </script>
 <head>
 <title>LON-CAPA Course Environment</title>
@@ -1769,7 +1757,7 @@ ENDOVER
 		push (@deldata,$thiskey);
 	    } elsif ($cmd eq 'datepointer') {
 		my $data=&Apache::lonhtmlcommon::get_date_from_form($ENV{$_});
-		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		if (defined($data) and $olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
 	    }
 	}
     }