--- loncom/interface/lonparmset.pm	2003/11/18 22:18:42	1.136
+++ loncom/interface/lonparmset.pm	2003/12/04 20:06:29	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.136 2003/11/18 22:18:42 albertel Exp $
+# $Id: lonparmset.pm,v 1.140 2003/12/04 20:06:29 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -131,12 +131,12 @@ sub parmval {
 
 # -------------------------------------------------------- first, check default
 
-    if ($def) { $outpar[11]=$def; $result=11; }
+    if (defined($def)) { $outpar[11]=$def; $result=11; }
 
 # ----------------------------------------------------- second, check map parms
 
     my $thisparm=$parmhash{$symbparm};
-    if ($thisparm) { $outpar[10]=$thisparm; $result=10; }
+    if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }
 
 # --------------------------------------------------------- third, check course
 
@@ -285,7 +285,7 @@ sub plink {
 
 
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments)=@_;
+    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
@@ -354,7 +354,9 @@ sub startpage {
 $selscript
 </head>
 $bodytag
+ENDHEAD
 
+    unless ($trimheader) {$r->print(<<ENDHEAD2);
 <form method="post" action="/adm/parmset" name="envform">
 <h4>$lt{'cep'}</h4>
 <input type="submit" name="crsenv" value="$lt{'scep'}" />
@@ -370,9 +372,12 @@ $bodytag
 <input type="submit" name="overview" value="$lt{'mcap'}" />
 </form>
 <hr />
+ENDHEAD2
+}
+    $r->print(<<ENDHEAD3);
 <form method="post" action="/adm/parmset" name="parmform">
 <h4>$lt{'captm'}</h4>
-ENDHEAD
+ENDHEAD3
 
     if (!$have_assesments) {
 	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
@@ -689,6 +694,7 @@ sub assessparms {
 
     my $pssymb='';
     my $parmlev='';
+    my $trimheader='';
     my $prevvisit=$ENV{'form.prevvisit'};
 
 #    unless ($parmlev==$ENV{'form.parmlev'}) {
@@ -711,11 +717,13 @@ sub assessparms {
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
+        $trimheader='yes';
     } elsif ($ENV{'form.symb'}) {
 	$pssymb=$ENV{'form.symb'};
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
+        $trimheader='yes';
     } else {
 	$ENV{'form.url'}='';
     }
@@ -905,7 +913,7 @@ sub assessparms {
     my $have_assesments=1;
     if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
 
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments);
+    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
 
     if (!$have_assesments) {
 	untie(%bighash);
@@ -1091,9 +1099,9 @@ sub assessparms {
                                   'rl'     => "Resource Level",
 				  'ic'     => 'in Course',
 				  'aut'    => "Assessment URL and Title",
-				  'type'   => 'Type',
+				  'type'   => &mt('Type'),
 				  'emof'   => "Enclosing Map or Folder",
-				  'part'   => 'Part',
+				  'part'   => &mt('Part'),
                                   'pn'     => 'Parameter Name',
 				  'def'    => 'default',
 				  'femof'  => 'from Enclosing Map or Folder',
@@ -1499,26 +1507,29 @@ sub crsenv {
 # -------------------------------------------------------- Get parameters again
 
     my %values=&Apache::lonnet::dump('environment',$dom,$crs);
+    my $SelectStyleFile=&mt('Select Style File');
     my $output='';
     if (! exists($values{'con_lost'})) {
         my %descriptions=
-	    ('url'            => '<b>Top Level Map</b> '.
+	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
                                  '<a href="javascript:openbrowser'.
                                  "('envform','url','sequence')\">".
-                                 'Select Map</a><br /><font color=red> '.
-                                 'Modification may make assessment data '.
-                                 'inaccessible</font>',
-             'description'    => '<b>Course Description</b>',
-             'courseid'       => '<b>Course ID or number</b><br />'.
-                                 '(internal, optional)',
-             'grading'        => '<b>Grading</b>'.
-                                 '"standard" or any other value.  '.
-                                 'Default for new courses is "standard".',
-
-             'default_xml_style' => '<b>Default XML Style File</b> '.
+                                 &mt('Select Map').'</a><br /><font color=red> '.
+                                 &mt('Modification may make assessment data inaccessible').
+                                 '</font>',
+             'description'    => '<b>'.&mt('Course Description').'</b>',
+             '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').'".',
+             'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
-                    ",'sty')\">Select Style File</a><br>",
+                    ",'sty')\">$SelectStyleFile</a><br>",
              'question.email' => '<b>Feedback Addresses for Resource Content '.
                                  'Questions</b><br />(<tt>user:domain,'.
                                  'user:domain(section;section;...;*;...),...</tt>)',
@@ -1570,9 +1581,9 @@ sub crsenv {
 	         => '<b>Allow limited HTML in discussion posts</b><br />'.
 	            '(Set value to "<tt>yes</tt>" to allow)',
 	     'rndseed'
-	         => '<b>Randomization algorithm used</b> <br />'.
-                    '<font color="red">Modifying this will make problems '.
-                    'have different numbers and answers</font>',
+	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
+                    '<font color="red">'.&mt('Modifying this will make problems').' '.
+                    &mt('have different numbers and answers').'</font>',
              'problem_stream_switch'
                  => '<b>Allow problems to be split over pages</b><br />'.
                     ' ("<tt>yes</tt>" if allowed, anything else if not)',
@@ -1583,7 +1594,7 @@ sub crsenv {
                                                 'when enrolling students</b>',
              'default_enrollment_end_date'   => '<b>Default ending date '.
                                                 'when enrolling students</b>',
-             'languages' => '<b>Languages used</b>',
+             'languages' => '<b>'.&mt('Languages used').'</b>',
              'disable_receipt_display'
                  => '<b>Disable display of problem receipts</b><br />'.
                     ' ("<tt>yes</tt>" to disable, anything else if not)'
@@ -1646,6 +1657,8 @@ sub crsenv {
                 $onchange.' /></td><td>'.
 	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
     }
+    my $Parameter=&mt('Parameter');
+    my $Value=&mt('Value');
     $r->print(<<ENDENV);
 <html>
 <script type="text/javascript" language="Javascript" >
@@ -1680,7 +1693,7 @@ $bodytag
 $setoutput
 <p>
 <table border=2>
-<tr><th>Parameter</th><th>Value</th><th>Set?</th></tr>
+<tr><th>$Parameter</th><th>$Value</th><th>Set?</th></tr>
 $output
 </table>
 <input type="submit" name="crsenv" value="Set Course Environment">