--- loncom/interface/lonsearchcat.pm	2007/06/15 23:29:17	1.287
+++ loncom/interface/lonsearchcat.pm	2008/02/12 18:48:03	1.289
@@ -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.289 2008/02/12 18:48:03 bisitz 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,6 +259,9 @@ 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
     ##
@@ -308,15 +312,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'},
@@ -759,8 +765,9 @@ sub setup_basic_search {
                   '</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 +868,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 +899,7 @@ ENDHEADER
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
-            $scrout .= 'related words';
+            $scrout .= &mt('related words');
         } else {
             $scrout .= '</td><td>&nbsp;';
         }
@@ -2265,14 +2272,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 +2448,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;
 }
@@ -3234,6 +3239,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 +3260,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 +3383,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 +3519,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 +3568,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 +3613,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',