--- loncom/interface/lonsearchcat.pm	2008/02/12 18:48:03	1.289
+++ 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.289 2008/02/12 18:48:03 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.298 2008/08/08 08:51:39 bisitz 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,6 +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[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)."</td></tr>\n";
     my $cafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
                                             'creationdate1', # fieldname
@@ -1062,10 +1054,10 @@ ENDHEADER
                                             '',          # state
                                             1,           # no_hh_mm_ss
                                             );
-    $scrout .= &mt('<tr><td align="right">Created between</td>'.
-                   '<td>[_1]</td></tr>'.
-                   '<tr><td align="right">and </td>'.
-                   '<td>[_2]</td></tr>',$cafter,$cbefore);
+    $scrout .= '<tr><td align="right">'.&mt('Created between').'</td>'
+              .'<td>'.$cafter.'</td></tr>'
+              .'<tr><td align="right">'.&mt('and').'</td>'
+              .'<td>'.$cbefore.'</td></tr>';
     my $lafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',
                                             'revisiondate1', 
@@ -1084,10 +1076,10 @@ ENDHEADER
                                             '',          # state
                                             1,           # no_hh_mm_ss
                                             );
-    $scrout .= &mt('<tr><td align="right">Last modified between </td>'.
-                   '<td>[_1]</td></tr>'.
-                   '<tr><td align="right">and</td>'.
-                   '<td>[_2]</td></tr>',$lafter,$lbefore);
+    $scrout .= '<tr><td align="right">'.&mt('Last modified between').'</td>'
+              .'<td>'.$lafter.'</td></tr>'
+              .'<tr><td align="right">'.&mt('and').'</td>'
+              .'<td>'.$lbefore.'</td></tr>';
     $scrout.="</table>\n";
     $scrout.=<<ENDDOCUMENT;
 $advanced_buttons
@@ -2125,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;
 }
 
@@ -2505,7 +2501,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();
@@ -2560,18 +2556,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(&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>'
+#             .'<th>&nbsp;</th>'
+             .&Apache::loncommon::end_data_table_header_row());
+    $r->print(&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>'
+#             ."<td>$revise</td>"
+             .&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print($revise
+             .'</form>');
     $r->rflush();
     &reset_timing();
     &update_seconds($r);
@@ -2643,8 +2643,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));