--- loncom/interface/lonparmset.pm	2003/12/12 15:13:50	1.145
+++ loncom/interface/lonparmset.pm	2004/05/14 00:55:27	1.160
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.145 2003/12/12 15:13:50 www Exp $
+# $Id: lonparmset.pm,v 1.160 2004/05/14 00:55:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,6 +306,11 @@ sub startpage {
 		    'oi'    => "or ID",
 		    'ad'    => "at Domain"
 				       );
+    my $overallhelp=
+	&Apache::loncommon::help_open_topic("Course_Setting_Parameters").
+	&Apache::loncommon::help_open_faq(10).
+	&Apache::loncommon::help_open_bug('Instructor Interface');
+    my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
     $r->print(<<ENDHEAD);
 <html>
 <head>
@@ -354,6 +359,7 @@ sub startpage {
 $selscript
 </head>
 $bodytag
+
 ENDHEAD
 
     unless ($trimheader) {$r->print(<<ENDHEAD2);
@@ -362,6 +368,7 @@ ENDHEAD
 <input type="submit" name="crsenv" value="$lt{'scep'}" />
 </form>
 <hr />
+$assessparmhelp
 <form method="post" action="/adm/helper/parameter.helper" name="helpform">
 <h4>$lt{'caphm'}</h4>
 <input type="submit" value="$lt{'smcap'}" />
@@ -580,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}='';
@@ -936,7 +944,9 @@ sub assessparms {
                         
     my $submitmessage = &mt('Update Section or Specific User');
     if (!$pssymb) {
-        $r->print('<tr><td>'.&mt('Select Parameter Level').'</td><td colspan="2">');
+        $r->print('<tr><td>'.&mt('Select Parameter Level').
+       &Apache::loncommon::help_open_topic('Course_Parameter_Levels').
+		  '</td><td colspan="2">');
         $r->print('<select name="parmlev">');
         foreach (reverse sort keys %alllevs) {
             $r->print('<option value="'.$alllevs{$_}.'"');
@@ -1144,8 +1154,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"';
@@ -1189,7 +1201,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");
 
@@ -1489,7 +1502,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') {
@@ -1519,14 +1532,11 @@ sub crsenv {
                                  &mt('Modification may make assessment data inaccessible').
                                  '</font>',
              'description'    => '<b>'.&mt('Course Description').'</b>',
-             'courseid'       => '<b>'.&mt('Course ID').' '.&mt('or').' '.&mt('number').
+             'courseid'       => '<b>'.&mt('Course ID or 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'".
@@ -1539,16 +1549,16 @@ sub crsenv {
              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
-                                 '("<tt>yes</tt>" for default hiding)',
+                                 '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
-                                 '("<tt>'.&mt('yes').'</tt>" '.&mt('for visible separation').', '.
+                                 '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
                                  &mt('changes will not show until next login').')',
 
              'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
                                   '</b><br />"<tt>st</tt>": '.
-                                  'student, "<tt>ta</tt>": '.
+                                  &mt('student').', "<tt>ta</tt>": '.
                                   'TA, "<tt>in</tt>": '.
-                                  'instructor;<br /><tt>role,role,...</tt>) '.
+                                  &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
 	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
              'plc.users.denied' => 
                           '<b>'.&mt('Disallow live chatroom use for Users').'</b><br />'.
@@ -1580,23 +1590,30 @@ sub crsenv {
                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
 	     'allow_limited_html_in_feedback'
 	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
-	            '('.&mt('Set value to').' "<tt>'.&mt('yes').'</tt>" '.&mt('to allow').')',
+	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
 	     'rndseed'
 	         => '<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').')',
+                    ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
              '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 />'.
-                    ' ("<tt>'.&mt('yes').'</tt>" '.&mt('to disable, anything else if not').')'
+                    ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+	     'tthoptions'
+	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
              ); 
         my @Display_Order = ('url','description','courseid','grading',
                              'default_xml_style','pageseparators',
@@ -1605,7 +1622,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',
@@ -1614,6 +1633,7 @@ sub crsenv {
                              'hideemptyrows',
                              'default_enrollment_start_date',
                              'default_enrollment_end_date',
+			     'tthoptions'
                              );
 	foreach my $parameter (sort(keys(%values))) {
             unless ($parameter =~ m/^internal\./) {
@@ -1658,34 +1678,21 @@ sub crsenv {
                 $onchange.' /></td><td>'.
 	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
     }
+    my %lt=&Apache::lonlocal::texthash(
+		    'par'   => 'Parameter',
+		    'val'   => 'Value',
+		    'set'   => 'Set',
+		    'sce'   => 'Set Course Environment'
+				       );
+
     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>
@@ -1695,10 +1702,10 @@ $bodytag
 $setoutput
 <p>
 <table border=2>
-<tr><th>$Parameter</th><th>$Value</th><th>$Set?</th></tr>
+<tr><th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th></tr>
 $output
 </table>
-<input type="submit" name="crsenv" value="Set Course Environment">
+<input type="submit" name="crsenv" value="$lt{'sce'}">
 </form>
 </body>
 </html>    
@@ -1759,7 +1766,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; }
 	    }
 	}
     }
