[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonsearchcat.pm

[raeburn]

raeburn		Thu May 10 18:34:18 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonsearchcat.pm 
  Log:
  - For 2.11.
    - Reverse 1.325, 1.328, 1.331. Wishlist not in 2.11.0.
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.331 loncom/interface/lonsearchcat.pm:1.331.4.1
--- loncom/interface/lonsearchcat.pm:1.331	Fri Dec  9 01:04:27 2011
+++ loncom/interface/lonsearchcat.pm	Thu May 10 18:34:18 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331 2011/12/09 01:04:27 www Exp $
+# $Id: lonsearchcat.pm,v 1.331.4.1 2012/05/10 18:34:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,6 @@
 use Parse::RecDescent;
 use Apache::lonnavmaps;
 use Apache::lonindexer();
-use Apache::lonwishlist();
 use LONCAPA;
 
 ######################################################################
@@ -3064,8 +3063,7 @@
 SCRIPT
 
     my $start_page  = &Apache::loncommon::start_page(undef,$js,
-						     {'only_body' =>1,
-                                                      'add_wishlist' =>1});
+						     {'only_body' =>1,});
     my $result=<<END;
 $start_page
 <form name="results" method="post" action="/adm/searchcat">
@@ -3184,11 +3182,7 @@
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '.
         '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
-        'target="preview">'.$values{'title'}."</a></b>\n".
-        '<a href="javascript:;" onclick="set_wishlistlink('."'$values{'title'}','$jumpurl'".')" '.
-        'title="'.&mt('Set link to wishlist').'">'.
-        '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-        'alt="set wishlistlink" style="width:22px;"/></a>';
+        'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
         ' <i>'.$values{'owner'}.'</i><br />';
@@ -3319,15 +3313,9 @@
     $jumpurl=~s|^/ext/|http://|;
     my $link = '<br />'.&display_url($jumpurl,1).'<br />';
 
-    my $titleWL = &mt('Set link to wishlist');
     $result.=<<END;
 <a href="$jumpurl?inhibitmenu=yes" 
    target="preview">$values{'title'}</a>
-<a href="javascript:;" onclick="set_wishlistlink('$values{'title'}','$jumpurl')" 
-   title="$titleWL">
-   <img class="LC_icon" src="/res/adm/pages/wishlist.png"
-        alt="set wishlistlink" style="width:22px;"/>
-</a>
 <br />
 $link<br />
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
@@ -3374,11 +3362,6 @@
     $result.=' <span class="LC_nobreak">'.
 	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
         &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
-        '<a href="javascript:;" onclick="set_wishlistlink('."'$values{'title'}','$jumpurl'".')" '.
-        'title="'.&mt('Set link to wishlist').'">'.
-        '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-        'alt="set wishlistlink" style="width:22px;"/>'.
-        '</a>'.
 	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
     return $result;
 }
@@ -3420,18 +3403,12 @@
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
 
-    my $titleWL = ('Set link to wishlist');
     my $result=<<END;
 $prefix <img src="$icon" alt="" />
 <dl>
 <dt>URL:</dt>
     <dd><a href="$jumpurl?inhibitmenu=yes" 
          target='preview'>$values{'url'}</a>
-         <a href="javascript:;" onclick="set_wishlistlink('$values{'title'}','$jumpurl')"
-            title="$titleWL">
-            <img class="LC_icon" src="/res/adm/pages/wishlist.png"
-            alt="set wishlistlink" style="width:22px;"/>
-         </a>
     </dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',