--- loncom/interface/lonsearchcat.pm 2008/05/28 21:07:29 1.293 +++ loncom/interface/lonsearchcat.pm 2008/08/08 08:51:39 1.298 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.293 2008/05/28 21:07:29 www Exp $ +# $Id: lonsearchcat.pm,v 1.298 2008/08/08 08:51:39 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -281,8 +281,9 @@ sub handler { $closebutton .="onClick='self.close()'"; } $closebutton .= ">"; + my $txt_import = &mt('IMPORT'); $importbutton=< END } else { @@ -2116,6 +2117,10 @@ sub copyright_check { ($env{'user.domain'} ne $resdom)) { return 0; } + # Check for custom rights + if ($Metadata->{'copyright'} eq 'custom') { + return &Apache::lonnet::customaccess('bre',$Metadata->{'url'}); + } return 1; } @@ -2496,7 +2501,7 @@ END pop(@Lines); } if (@Lines > 2) { - $pretty_string = join '
',(@Lines[0..2],'....
'); + $pretty_string = join '
',(@Lines[0..2],'...
'); } $r->print(&mt("Search: [_1]",$pretty_string)); $r->rflush(); @@ -2551,18 +2556,22 @@ END my $server; my $status; my $revise = &revise_button(); - $r->print(< -StatusTotal MatchesTime Remaining - - - - -$revise - - - -END + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row() + .''.&mt('Status').'' + .''.&mt('Total Matches').'' + .''.&mt('Time Remaining').'' +# .' ' + .&Apache::loncommon::end_data_table_header_row()); + $r->print(&Apache::loncommon::start_data_table_row() + .'' + .'' + .'' +# ."$revise" + .&Apache::loncommon::end_data_table_row()); + $r->print(&Apache::loncommon::start_data_table()); + $r->print($revise + .''); $r->rflush(); &reset_timing(); &update_seconds($r);