[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm

[www]

www		Thu Jun  2 18:03:21 2005 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm 
  Log:
  Cleanup
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.201 loncom/interface/lonparmset.pm:1.202
--- loncom/interface/lonparmset.pm:1.201	Thu Jun  2 15:17:12 2005
+++ loncom/interface/lonparmset.pm	Thu Jun  2 18:03:18 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.201 2005/06/02 19:17:12 www Exp $
+# $Id: lonparmset.pm,v 1.202 2005/06/02 22:03:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -442,9 +442,8 @@
 		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }
 
-
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
+    my ($r,$id,$udom,$csec,$uname,$have_assessments)=@_;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
@@ -454,12 +453,6 @@
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my %lt=&Apache::lonlocal::texthash(
-		    'cep'   => "Course Environment Parameters",
-		    'scep'  => "Set Course Environment Parameters",
-		    'smcap' => "Set/Modify Course Assessment Parameter",
-		    'mcap'  => "Modify Course Assessment Parameters",
-		    'caphm' => "Course Assessment Parameter - Helper Mode",
-		    'capom' => "Course Assessment Parameters - Overview Mode",
                     'captm' => "Course Assessments Parameters - Table Mode",
 		    'sg'    => "Section/Group",
 		    'fu'    => "For User",
@@ -521,26 +514,6 @@
 $breadcrumbs
 $overallhelp
 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'}" />
-</form>
-<hr />
-$assessparmhelp
-<form method="post" action="/adm/helper/parameter.helper" name="helpform">
-<h4>$lt{'caphm'}</h4>
-<input type="submit" value="$lt{'smcap'}" />
-</form>
-<hr />
-<form method="post" action="/adm/parmset" name="overview">
-<h4>$lt{'capom'}</h4>
-<input type="submit" name="overview" value="$lt{'mcap'}" />
-</form>
-<hr />
-ENDHEAD2
-    }
     my %sectionhash=();
     my $sections='';
     if (&Apache::loncommon::get_sections(
@@ -559,8 +532,8 @@
 <h4>$lt{'captm'}</h4>
 ENDHEAD3
 
-    if (!$have_assesments) {
-	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
+    if (!$have_assessments) {
+	$r->print('<font color="red">'.&mt('There are no assessment parameters in this course to set.').'</font><br />');	
     } else {
 	$r->print(<<ENDHEAD);
 <b>
@@ -896,7 +869,6 @@
 
     my $pssymb='';
     my $parmlev='';
-    my $trimheader='';
     my $prevvisit=$env{'form.prevvisit'};
  
     unless ($env{'form.parmlev'}) {
@@ -915,13 +887,11 @@
 	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'}='';
     }
@@ -1006,11 +976,7 @@
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    my $have_assesments=1;
-    if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
-
-    $trimheader = 'yes';
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
+    &startpage($r,$id,$udom,$csec,$uname,scalar(keys(%allkeys)));
 
 #    if ($env{'form.url'}) {
 #	$r->print('<input type="hidden" value="'.$env{'form.url'}.