--- loncom/interface/lonparmset.pm	2003/05/27 21:22:13	1.95
+++ 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.95 2003/05/27 21:22:13 www Exp $
+# $Id: lonparmset.pm,v 1.104 2003/06/20 14:21:03 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,6 @@ use Apache::lonnet;
 use Apache::Constants qw(:common :http REDIRECT);
 use Apache::lonhtmlcommon();
 use Apache::loncommon;
-use Apache::lonmenu;
 use GDBM_File;
 use Apache::lonhomework;
 use Apache::lonxml;
@@ -286,14 +285,10 @@ sub plink {
 
 
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname)=@_;
- 
-    my $bodytag=&Apache::lonmenu::registerurl().
-                &Apache::loncommon::bodytag('Set Course Parameters','',
-                                            'onUnload="'.
-       &Apache::lonmenu::unloadevents().';pclose();" onLoad="'.
-       &Apache::lonmenu::loadevents().'"').
-       &Apache::lonmenu::regflush();
+    my ($r,$id,$udom,$csec,$uname,$have_assesments)=@_;
+
+    my $bodytag=&Apache::loncommon::bodytag('Set Course Parameters','',
+                                            'onUnload="pclose()"');
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
@@ -347,15 +342,23 @@ $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) {
+	$r->print('<font color="red">There are no assesment parameters in this course to set.</font><br />');	
+    } else {
+	$r->print(<<ENDHEAD);
 <b>
 Section/Group:
 <input type="text" value="$csec" size="6" name="csec">
@@ -371,7 +374,7 @@ $chooseopt
 <input type="hidden" value='' name="pres_type">
 <input type="hidden" value='' name="pres_marker">
 ENDHEAD
-
+    }
 }
 
 sub print_row {
@@ -725,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 ".
@@ -766,6 +769,7 @@ sub assessparms {
 
     $mapp{'0.0'} = '';
     $symbp{'0.0'} = '';
+
 # ---------------------------------------------------------- Anything to store?
     if ($ENV{'form.pres_marker'}) {
 	my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
@@ -882,7 +886,12 @@ sub assessparms {
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    &startpage($r,$id,$udom,$csec,$uname);
+    my $have_assesments=1;
+    if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
+
+    &startpage($r,$id,$udom,$csec,$uname,$have_assesments);
+
+    if (!$have_assesments) { return ''; }
 #    if ($ENV{'form.url'}) {
 #	$r->print('<input type="hidden" value="'.$ENV{'form.url'}.
 #		  '" name="url"><input type="hidden" name="command" value="set">');
@@ -897,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{$_}.'"');
@@ -916,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">');
@@ -940,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>");
@@ -1025,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) {
@@ -1048,9 +1054,7 @@ sub assessparms {
         my $csuname=$ENV{'user.name'};
         my $csudom=$ENV{'user.domain'};
 
-
         if ($parmlev eq 'full' || $parmlev eq 'brief') {
-
            my $coursespan=$csec?8:5;
            $r->print('<p><table border=2>');
            $r->print('<tr><td colspan=5></td>');
@@ -1070,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
@@ -1438,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>',
@@ -1447,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>)',
@@ -1473,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)',
@@ -1492,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)) {
@@ -1591,7 +1595,6 @@ sub handler {
 
     $r->content_type('text/html');
     $r->send_http_header;
-
 # ----------------------------------------------------- Needs to be in a course
 
     if (($ENV{'request.course.id'}) &&