--- loncom/interface/groupsort.pm 2005/06/10 20:43:10 1.37 +++ loncom/interface/groupsort.pm 2006/03/19 22:26:31 1.40 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.37 2005/06/10 20:43:10 www Exp $ +# $Id: groupsort.pm,v 1.40 2006/03/19 22:26:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -195,6 +195,7 @@ sub cleanup { &Apache::lonnet::logthis('Failed cleanup groupsort: hash'); } } + return OK; } # -------------------------------------------------------------- Read from file @@ -300,12 +301,8 @@ ENDADV } # output start of web page - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network With CAPA Group Sorter - - END # read pertinent machine configuration my $domain = $r->dir_config('lonDefDomain'); @@ -351,7 +347,7 @@ END my $ctr = 0; my $clen = scalar(keys %shash); - if ($clen > 1) { + if (($clen > 1) || ($env{'form.readfile'})) { my %lt=&Apache::lonlocal::texthash( 'fin'=> 'Finalize order of resources', 'gb' => 'Go Back', @@ -363,7 +359,8 @@ END 'pa' => 'Path', 'in' => 'Include' ); - $r->print(&Apache::loncommon::bodytag('Sort Imported Resources')); + $r->print(&Apache::loncommon::start_page('Sort Imported Resources', + $js)); $r->print(<$lt{'fin'}
print("$lt{'ti'}\n"); $r->print("$lt{'pa'}\n"); } else { + $r->print(&Apache::loncommon::start_page(undef,$js, + {'only_body' => 1}); $r->print(< @@ -421,7 +419,7 @@ END my $key=$_; $ctr++; my $iconname=&Apache::loncommon::icon($key); - if ($clen > 1) { + if (($clen > 1) || ($env{'form.readfile'})) { $r->print(""); if ($env{'form.readfile'}) { $r->print(&checkbox($ctr-1)); @@ -430,7 +428,7 @@ END } } $r->print(&hidden($ctr-1,$thash{$key},$key)); - if ($clen > 1) { + if (($clen > 1) || ($env{'form.readfile'})) { $r->print(""); unless ($env{'form.readfile'}) { $r->print("". @@ -444,7 +442,7 @@ END $r->print("$key\n"); } } - if ($clen > 1) { + if (($clen > 1) || ($env{'form.readfile'})) { $r->print(""); } else { $r->print(< END } - $r->print(< - -END + + $r->print(&Apache::loncommon::end_page()); return OK; }