--- loncom/interface/lonparmset.pm	2004/04/28 15:33:12	1.157
+++ loncom/interface/lonparmset.pm	2004/08/27 21:43:09	1.168.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.157 2004/04/28 15:33:12 sakharuk Exp $
+# $Id: lonparmset.pm,v 1.168.2.2 2004/08/27 21:43:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -307,9 +307,7 @@ sub startpage {
 		    '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');
+	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
     my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
     $r->print(<<ENDHEAD);
 <html>
@@ -359,7 +357,7 @@ sub startpage {
 $selscript
 </head>
 $bodytag
-
+$overallhelp
 ENDHEAD
 
     unless ($trimheader) {$r->print(<<ENDHEAD2);
@@ -439,7 +437,7 @@ sub print_row {
         $parm=~s|\[.*\]\s||g;
     }
 
-    $r->print('<td bgcolor='.$defbgone.'>'.&mt($parm).'</td>');
+    $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
    
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
@@ -587,8 +585,8 @@ sub extractResourceInformation {
 	    my $resid=$2;
 	    my $id=$mapid.'.'.$resid;
 	    my $srcf=$$bighash{$_};
-#	    if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (1) {
+		$srcf=~/\.(\w+)$/;
 		$$ids[$#$ids+1]=$id;
 		$$typep{$id}=$1;
 		$$keyp{$id}='';
@@ -597,6 +595,10 @@ sub extractResourceInformation {
                     my $key=$_;
                     my $allkey=$1;
                     $allkey=~s/\_/\./g;
+		    if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 
+			'parm') {
+			next; #hide hidden things
+		    }
                     my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
                     my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
                     my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
@@ -944,7 +946,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{$_}.'"');
@@ -1335,6 +1339,7 @@ ENDMAPONE
                 $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
 
 	        foreach (sort keys %name) {
+                    $r->print('<tr>');
                     &print_row($r,$_,\%part,\%name,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,
                            $parmlev);
@@ -1412,6 +1417,7 @@ ENDMAPONE
             $r->print('<th>'.&mt('Parameter in Effect').'</th></tr>');
 
 	    foreach (sort keys %name) {
+                $r->print('<tr>');
                 &print_row($r,$_,\%part,\%name,$mapid,\%default,
                        \%type,\%display,$defbgone,$defbgtwo,$parmlev);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
@@ -1530,7 +1536,7 @@ 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><br />'.
@@ -1547,16 +1553,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 />'.
@@ -1588,7 +1594,7 @@ 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').' '.
@@ -1596,9 +1602,17 @@ sub crsenv {
 	     'receiptalg'
 	         => '<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').')',
              '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>').')',
+             'default_paper_size' 
+                 => '<b>'.&mt('Default paper type').'</b><br />'.
+                    ' ('.&mt('supported types').': Letter [8 1/2x11 in], Legal [8 1/2x14 in],'. 
+                    ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'. 
+                    ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
              'anonymous_quiz'
                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
@@ -1609,7 +1623,10 @@ sub crsenv {
              '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>').')',
+	     'disablesigfigs'
+	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
+                    ' ('.&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>'
              ); 
@@ -1624,6 +1641,8 @@ sub crsenv {
                              'rndseed',
                              'receiptalg',
                              'problem_stream_switch',
+			     'suppress_tries',
+                             'default_paper_size',
                              'disable_receipt_display',
                              'spreadsheet_default_classcalc',
                              'spreadsheet_default_studentcalc',
@@ -1631,7 +1650,8 @@ sub crsenv {
                              'hideemptyrows',
                              'default_enrollment_start_date',
                              'default_enrollment_end_date',
-			     'tthoptions'
+			     'tthoptions',
+			     'disablesigfigs'
                              );
 	foreach my $parameter (sort(keys(%values))) {
             unless ($parameter =~ m/^internal\./) {
@@ -1686,7 +1706,7 @@ sub crsenv {
     my $Parameter=&mt('Parameter');
     my $Value=&mt('Value');
     my $Set=&mt('Set');
-    my $browse_js=&Apache::loncommon::browser_and_searcher_javascript();
+    my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
     $r->print(<<ENDENV);
 <html>
 <script type="text/javascript" language="Javascript" >
@@ -1808,9 +1828,10 @@ ENDOVER
 	    $middle=~s/\.$//;
 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).'</font>';
+		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
 	    } elsif ($middle) {
-		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'</font>';
+		my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
 	    }
 	    if ($section ne $oldsection) {
 		$r->print(&tableend()."\n<hr /><h1>$section</h1>");
@@ -1897,7 +1918,10 @@ sub handler {
 # ----------------------------------------------------- Needs to be in a course
 
     if (($ENV{'request.course.id'}) && 
-	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) {
+	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}) || 
+	 &Apache::lonnet::allowed('opa',$ENV{'request.course.id'}.'/'.
+				  $ENV{'request.course.sec'})
+	 )) {
 
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
