--- loncom/interface/lonsearchcat.pm	2007/06/15 23:29:17	1.287
+++ 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.287 2007/06/15 23:29:17 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.299 2008/08/27 19:50:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
              ['catalogmode','launch','acts','mode','form','element','pause',
               'phase','persistent_db_id','table','start','show',
-              'cleargroupsort','titleelement','area']);
+              'cleargroupsort','titleelement','area','inhibitmenu']);
     ##
     ## The following is a trick - we wait a few seconds if asked to so
     ##     the daemon running the search can get ahead of the daemon
@@ -190,7 +190,8 @@ sub handler {
     }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
-               'catalogmode='.$env{'form.catalogmode'}.
+	       &Apache::loncommon::inhibit_menu_check().
+               '&catalogmode='.$env{'form.catalogmode'}.
                '&launch='.$env{'form.launch'}.
                '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
@@ -258,11 +259,14 @@ sub handler {
     if (exists($env{'form.area'})) {
         $hidden_fields .= &hidden_field('area');
     }
+    if (exists($env{'form.inhibitmenu'})) {
+        $hidden_fields .= &hidden_field('inhibitmenu');
+    }
     ##
     ## 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 {
@@ -270,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 {
@@ -308,15 +313,17 @@ END
             $srchtype = 'Portfolio';
         }
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/searchcat?phase=disp_adv&'.
-                  'catalogmode='.$env{'form.catalogmode'}.
+            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+		  '&phase=disp_adv'.
+                  '&catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
                   '&mode='.$env{'form.mode'},
                   text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
     } elsif ($env{'form.searchmode'} eq 'course search') {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/searchcat?phase=disp_adv&'.
+            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+		  '&phase=disp_adv'.
                   'catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
                   '&mode='.$env{'form.mode'},
@@ -753,14 +760,10 @@ 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?'.
-                       'phase=disp_adv&'.
-                       'catalogmode='.$env{'form.catalogmode'}.
+	               &Apache::loncommon::inhibit_menu_check().
+		       '&phase=disp_adv'.
+                       '&catalogmode='.$env{'form.catalogmode'}.
                        '&launch='.$env{'form.launch'}.
                        '&mode='.$env{'form.mode'}.
                        '&area='.$area.
@@ -861,7 +864,7 @@ ENDHEADER
         '<input type="hidden" name="phase" value="adv_search" />';
     my %fields=&Apache::lonmeta::fieldnames();
     #
-    $scrout .= '<h3>'.&mt('Standard [_1] Metadata',$srchtype).'</h3>';
+    $scrout .= '<h3>'.&mt("Standard $srchtype Metadata").'</h3>';
     $scrout .= "<table>\n";
     $scrout .= '<tr><td>&nbsp;</td><td colspan="2"><font size="-1">'.
         ('&nbsp;'x2).&searchhelp()."</font></td></tr>\n";
@@ -892,7 +895,7 @@ ENDHEADER
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
-            $scrout .= 'related words';
+            $scrout .= &mt('related words');
         } else {
             $scrout .= '</td><td>&nbsp;';
         }
@@ -919,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
@@ -1037,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
@@ -1055,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', 
@@ -1077,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
@@ -2118,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;
 }
 
@@ -2265,14 +2268,11 @@ END
 #    }
 #    $result.="</select>\n";
     my $revise = &revise_button();
-    $result.=<<END;
-<p>
-There are $total_results matches to your query. $revise
-</p><p>
-Search: $pretty_query_string
-</p>
-</form>
-END
+    $result.='<p>'
+            .&mt('There are [_1] matches to your query.',$total_results)
+            .' '.$revise.'</p>'
+            .'<p>'.&mt('Search: ').$pretty_query_string
+            .'</p></form>';
     $r->print($result.&Apache::loncommon::end_page());
     return;
 }
@@ -2444,13 +2444,14 @@ Returns: html string for a 'revise searc
 ######################################################################
 ######################################################################
 sub revise_button {
+    my $revisetext = &mt('Revise search');
     my $revise_phase = 'disp_basic';
     $revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$env{'form.persistent_db_id'}.
             '&cleargroupsort=1'.
             '&phase='.$revise_phase;
-    my $result = qq{<input type="button" value="Revise search" name="revise"} .
+    my $result = qq{<input type="button" value="$revisetext" name="revise"} .
         qq{ onClick="parent.location='$newloc';" /> };
     return $result;
 }
@@ -2488,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;
@@ -2500,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();
@@ -2555,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);
@@ -2638,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));
 
@@ -3234,6 +3235,7 @@ function changeURL(val) {
 SCRIPT
         }
     }
+    my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check();
     $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';
 <script type="text/javascript">
     function queue(checkbox_num,val) {
@@ -3254,7 +3256,7 @@ SCRIPT
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import&acts="+
+    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
 	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
 </script>
@@ -3377,7 +3379,7 @@ sub detailed_citation_view {
     $jumpurl=~s|^/ext/|http://|;
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
-        '<a href="'.$jumpurl.'" '.
+        '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
         'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
@@ -3513,7 +3515,7 @@ sub summary_view {
     my $link = &display_url($jumpurl,[2,0,1]);
 
     $result.=<<END;
-<a href="$jumpurl" 
+<a href="$jumpurl?inhibitmenu=yes" 
    target='preview'>$values{'title'}</a> <br />
 $link <br />
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
@@ -3562,7 +3564,7 @@ sub compact_view {
     }
     $jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
     $result.=' <span class="LC_nobreak">'.
-	'<a href="'.$jumpurl.'" target="preview">'.
+	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
         &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
 	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
     return $result;
@@ -3607,7 +3609,7 @@ sub fielded_format_view {
 $prefix <img src="$icon" />
 <dl>
 <dt>URL:</dt>
-    <dd><a href="$jumpurl" 
+    <dd><a href="$jumpurl?inhibitmenu=yes" 
          target='preview'>$values{'url'}</a></dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',