--- loncom/interface/lonsearchcat.pm	2008/02/13 11:20:24	1.290
+++ loncom/interface/lonsearchcat.pm	2008/08/27 19:50:46	1.299
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.290 2008/02/13 11:20:24 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.299 2008/08/27 19:50:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -266,7 +266,7 @@ sub handler {
     ## Configure dynamic components of interface
     ##
     if ($env{'form.catalogmode'} eq 'interactive') {
-        $closebutton="<input type='button' name='close' value='CLOSE' ";
+        $closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
 	    $closebutton .="onClick='parent.close()'";
         } else {
@@ -274,15 +274,16 @@ sub handler {
         }
         $closebutton .=">\n";
     } elsif ($env{'form.catalogmode'} eq 'import') {
-        $closebutton="<input type='button' name='close' value='CLOSE' ";
+        $closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
 	    $closebutton .="onClick='parent.close()'";
         } else {
             $closebutton .="onClick='self.close()'";
         }
         $closebutton .= ">";
+        my $txt_import = &mt('IMPORT');
         $importbutton=<<END;
-<input type='button' name='import' value='IMPORT'
+<input type='button' name='import' value='$txt_import'
 onClick='javascript:select_group()'>
 END
     } else {
@@ -759,11 +760,6 @@ sub setup_basic_search {
                                        $r->dir_config('lonDefDomain')),
 				      $r->dir_config('lonDefDomain')).
                         '</label>';
-    if ($area eq 'res') {
-        $inclext= '<label>'.&mt('[_1] include external resources',
-             &Apache::lonhtmlcommon::checkbox('inclext',$env{'form.inclext'})).
-                  '</label>';
-    }
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
 		       '&phase=disp_adv'.
@@ -926,11 +922,6 @@ ENDHEADER
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
 						   '<br /><label>';
-            if ($env{'form.area'} ne 'portfolio') {
-                $scrout .= &mt('[_1] include external resources',
-                           &Apache::lonhtmlcommon::checkbox
-                           ('inclext',$env{'form.inclext'})).'</label>'
-            }
      $scrout .= '</td></tr>'.$/;
     #
     # Misc metadata
@@ -1044,7 +1035,7 @@ ENDHEADER
     # Creation/Modification date limits
     $scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>';
     $scrout .= "\n<table>\n";
-    $scrout .= "<tr><td>&nbsp;</td><td>".&mt('(Month - Day - Year)')."</td></tr>\n";
+    $scrout .= "<tr><td>&nbsp;</td><td>".&mt('Month[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)."</td></tr>\n";
     my $cafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
                                             'creationdate1', # fieldname
@@ -2126,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;
 }
 
@@ -2494,8 +2489,6 @@ sub run_search {
     $r->print(<<END);
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post">
-<input type="hidden" name="acts" value="" />
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2506,7 +2499,7 @@ END
         pop(@Lines);
     }
     if (@Lines > 2) {
-        $pretty_string = join '<br />',(@Lines[0..2],'....<br />');
+        $pretty_string = join '<br />',(@Lines[0..2],'...<br />');
     }
     $r->print(&mt("Search: [_1]",$pretty_string));
     $r->rflush();
@@ -2561,18 +2554,22 @@ END
     my $server; 
     my $status;
     my $revise = &revise_button();
-    $r->print(<<END);
-<table>
-<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
-<tr>
-<td><input type="text" name="status"  value="" size="50" /></td>
-<td><input type="text" name="count"   value="" size="10" /></td>
-<td><input type="text" name="seconds" value="" size="8" /></td>
-<td>$revise</td>
-</tr>
-</table>
-</form>
-END
+    $r->print('<form name="statusform" action="" method="post">'."\n".
+              '<input type="hidden" name="acts" value="" />'."\n".
+              '<table border="0"><tr><td>'."\n".
+              &Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.&mt('Status').'</th>'
+             .'<th>'.&mt('Total Matches').'</th>'
+             .'<th>'.&mt('Time Remaining').'</th>'
+             .&Apache::loncommon::end_data_table_header_row()
+             .&Apache::loncommon::start_data_table_row()
+             .'<td><input type="text" name="status"  value="" size="50" readonly="readonly" /></td>'
+             .'<td><input type="text" name="count"   value="" size="10" readonly="readonly" /></td>'
+             .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
+             .&Apache::loncommon::end_data_table_row()
+             .&Apache::loncommon::end_data_table()
+             .'</td><td>&nbsp;</td><td>'.$revise.'</td></tr></table></form>');
     $r->rflush();
     &reset_timing();
     &update_seconds($r);
@@ -2644,8 +2641,6 @@ END
                     my %Fields = &parse_raw_result($result,$server,$tabletype);
                     $Fields{'hostname'} = $server;
                     #
-                    # Skip if external and we did not want that
-                    next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
                     # Skip based on copyright
                     next if (! &copyright_check(\%Fields));