--- loncom/interface/lonparmset.pm	2003/06/13 20:01:02	1.99
+++ loncom/interface/lonparmset.pm	2003/06/20 14:21:03	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.99 2003/06/13 20:01:02 albertel Exp $
+# $Id: lonparmset.pm,v 1.104 2003/06/20 14:21:03 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -342,15 +342,17 @@ $selscript
 </head>
 $bodytag
 
-<a href="/adm/helper/parameter.helper">Use Assignment Parameter Helper</a>, a
-simpler interface to set open, due, or answer open dates for problems or sequences.
-
 <form method="post" action="/adm/parmset" name="envform">
 <h3>Course Environment</h3>
 <input type="submit" name="crsenv" value="Set Course Environment">
 </form>
+<hr />
 <form method="post" action="/adm/parmset" name="parmform">
 <h3>Course Assessments</h3>
+
+<a href="/adm/helper/parameter.helper">Use Assignment Parameter Helper</a>, a
+simpler interface to set open, due, or answer open dates for problems or
+sequences.<br />&nbsp;<br />
 ENDHEAD
 
     if (!$have_assesments) {
@@ -726,8 +728,8 @@ sub assessparms {
 		"<font color=red>Unknown user '$uname' at domain '$udom'</font>";
 	    $uname='';
         } else {
-	    $csec=&Apache::lonnet::usection($udom,$uname,
-					    $ENV{'request.course.id'});
+	    $csec=&Apache::lonnet::getsection($udom,$uname,
+					      $ENV{'request.course.id'});
 	    if ($csec eq '-1') {
 		$message="<font color=red>".
 		    "User '$uname' at domain '$udom' not ".
@@ -904,16 +906,9 @@ sub assessparms {
 
     $r->print('<h2>'.$message.'</h2><table>');
                         
-    $r->print('<tr><td><hr /></td></tr>');
-
     my $submitmessage;
-    if (($prevvisit) || ($pschp) || ($pssymb)) {
-        $submitmessage = "Update Display";
-    } else {
-        $submitmessage = "Display";
-    }
     if (!$pssymb) {
-        $r->print('<tr><td>Select Parameter Level</td><td>');
+        $r->print('<tr><td>Select Parameter Level</td><td colspan="2">');
         $r->print('<select name="parmlev">');
         foreach (reverse sort keys %alllevs) {
             $r->print('<option value="'.$alllevs{$_}.'"');
@@ -923,10 +918,8 @@ sub assessparms {
             $r->print('>'.$_.'</option>');
         }
         $r->print("</select></td>\n");
-    
-        $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
 
-        $r->print('</tr><tr><td><hr /></td>');
+        $r->print('</tr>');
 
         $r->print('<tr><td>Select Enclosing Map or Folder</td>');
         $r->print('<td colspan="2"><select name="pschp">');
@@ -947,7 +940,7 @@ sub assessparms {
 
     $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show" onclick="form.submit();">Show More Options<hr /></td></tr>');
+    $r->print(' name="showoptions" value="show">Show More Options<hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");
@@ -1032,7 +1025,13 @@ sub assessparms {
         }
 
     }
-    $r->print('</table>');
+    $r->print('</table><br />');
+    if (($prevvisit) || ($pschp) || ($pssymb)) {
+        $submitmessage = "Update Course Assessment Parameter Display";
+    } else {
+        $submitmessage = "Set Course Assessment Parameters";
+    }
+    $r->print('<input type="submit" name="dis" value="'.$submitmessage.'">');
 
 #    my @temp_psprt;
 #    foreach my $t (@psprt) {
@@ -1075,7 +1074,7 @@ ENDTABLETWO
            }
            $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>Assessment URL and Title</th><th>Type</th>
-<th>Enclosing Map or Folder</th><th>Part No.</th><th>Parameter Name</th>
+<th>Enclosing Map or Folder</th><th>Part</th><th>Parameter Name</th>
 <th>default</th><th>from Enclosing Map or Folder</th>
 <th>general</th><th>for Enclosing Map or Folder</th><th>for Resource</th>
 ENDTABLEHEADFOUR
@@ -1443,7 +1442,7 @@ sub crsenv {
 	    ('url'            => '<b>Top Level Map</b> '.
                                  '<a href="javascript:openbrowser'.
                                  "('envform','url','sequence')\">".
-                                 'Browse</a><br /><font color=red> '.
+                                 'Select Map</a><br /><font color=red> '.
                                  'Modification may make assessment data '.
                                  'inaccessible</font>',
              'description'    => '<b>Course Description</b>',
@@ -1452,7 +1451,7 @@ sub crsenv {
              'default_xml_style' => '<b>Default XML Style File</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
-                    ",'sty')\">Browse</a><br>",
+                    ",'sty')\">Select Style File</a><br>",
              'question.email' => '<b>Feedback Addresses for Resource Content '.
                                  'Questions</b><br />(<tt>user:domain,'.
                                  'user:domain(section;section;...;*;...),...</tt>)',
@@ -1478,17 +1477,17 @@ sub crsenv {
                  => '<b>Default Course Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_classcalc'".
-                    ",'spreadsheet')\">Browse</a><br />",
+                    ",'spreadsheet')\">Select Spreadsheet File</a><br />",
              'spreadsheet_default_studentcalc' 
                  => '<b>Default Student Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_calc'".
-                    ",'spreadsheet')\">Browse</a><br />",
+                    ",'spreadsheet')\">Select Spreadsheet File</a><br />",
              'spreadsheet_default_assesscalc' 
                  => '<b>Default Assessment Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_assesscalc'".
-                    ",'spreadsheet')\">Browse</a><br />",
+                    ",'spreadsheet')\">Select Spreadsheet File</a><br />",
 	     'allow_limited_html_in_feedback'
 	         => '<b>Allow limited HTML in discussion posts</b><br />'.
 	            '(Set value to yes to allow)',
@@ -1497,7 +1496,7 @@ sub crsenv {
                     '<font color="red">Modifying this will make problems '.
                     'have different numbers and answers</font>',
              'problem_stream_switch'
-                 => '<b>Allow problems to be splitted over pages</b><br />'.
+                 => '<b>Allow problems to be split over pages</b><br />'.
                     ' (<tt><b>yes</b> if allow anything else if not</tt>)'
              );
 	foreach (keys(%values)) {